diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java index 5941317b..903de72c 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java @@ -18,6 +18,9 @@ package com.wisemapping.exporter; +import org.apache.batik.parser.AWTTransformProducer; +import org.apache.batik.parser.ParseException; +import org.apache.batik.parser.TransformListParser; import org.apache.batik.transcoder.Transcoder; import org.apache.batik.transcoder.TranscoderException; import org.apache.batik.transcoder.TranscoderInput; @@ -34,23 +37,23 @@ import org.xml.sax.SAXException; import sun.misc.BASE64Encoder; import javax.servlet.ServletContext; -import javax.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLStreamException; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.xpath.*; +import java.awt.geom.AffineTransform; import java.io.*; import java.util.regex.Pattern; public class ExporterFactory { private static final String GROUP_NODE_NAME = "g"; - private static final String RECT_NODE_NAME = "rect"; private static final String IMAGE_NODE_NAME = "image"; + public static final int MARGING = 50; private File baseImgDir; public ExporterFactory(@NotNull final ServletContext servletContext) throws ParserConfigurationException { @@ -61,7 +64,7 @@ public class ExporterFactory { this.baseImgDir = baseImgDir; } - public void export(@NotNull ExportProperties properties, @Nullable String xml, @NotNull OutputStream output, @Nullable String mapSvg) throws TranscoderException, IOException, ParserConfigurationException, SAXException, XMLStreamException, TransformerException, JAXBException, ExportException { + public void export(@NotNull ExportProperties properties, @Nullable String xml, @NotNull OutputStream output, @Nullable String mapSvg) throws ExportException, IOException, TranscoderException { final ExportFormat format = properties.getFormat(); switch (format) { @@ -74,8 +77,7 @@ public class ExporterFactory { transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth()); // Create the transcoder input. - final Document document = normalizeSvg(mapSvg, false); - final String svgString = domToString(document); + final String svgString = normalizeSvg(mapSvg, false); final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray())); TranscoderOutput trascoderOutput = new TranscoderOutput(output); @@ -95,8 +97,7 @@ public class ExporterFactory { transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth()); // Create the transcoder input. - final Document document = normalizeSvg(mapSvg, false); - final String svgString = domToString(document); + final String svgString = normalizeSvg(mapSvg, false); final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray())); TranscoderOutput trascoderOutput = new TranscoderOutput(output); @@ -110,10 +111,8 @@ public class ExporterFactory { final Transcoder transcoder = new PDFTranscoder(); // Create the transcoder input. - final Document document = normalizeSvg(mapSvg, false); - final String svgString = domToString(document); + final String svgString = normalizeSvg(mapSvg, false); final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray())); - TranscoderOutput trascoderOutput = new TranscoderOutput(output); // Save the image. @@ -121,8 +120,8 @@ public class ExporterFactory { break; } case SVG: { - final Document dom = normalizeSvg(mapSvg, true); - output.write(domToString(dom).getBytes("UTF-8")); + final String svgString = normalizeSvg(mapSvg, true); + output.write(svgString.getBytes("UTF-8")); break; } case FREEMIND: { @@ -135,50 +134,56 @@ public class ExporterFactory { } } - private Document normalizeSvg(@NotNull String svgXml, boolean embedImg) throws XMLStreamException, ParserConfigurationException, IOException, SAXException, TransformerException { + private String normalizeSvg(@NotNull String svgXml, boolean embedImg) throws ExportException { - final DocumentBuilder documentBuilder = getDocumentBuilder(); - if (!svgXml.trim().startsWith("]+)>", ""); + + final Reader in = new CharArrayReader(svgXml.toCharArray()); + final InputSource is = new InputSource(in); + document = documentBuilder.parse(is); + } + + resizeSVG(document); + + final Node child = document.getFirstChild(); + inlineImages(document, (Element) child); + + return domToString(document); + } catch (ParserConfigurationException e) { + throw new ExportException(e); + } catch (IOException e) { + throw new ExportException(e); } catch (SAXException e) { - // It must be a corrupted SVG format. Try to hack it and try again ... - svgXml = svgXml.replaceAll("]+)>", ""); - - final Reader in = new CharArrayReader(svgXml.toCharArray()); - final InputSource is = new InputSource(in); - document = documentBuilder.parse(is); + throw new ExportException(e); + } catch (TransformerException e) { + throw new ExportException(e); } - - fitSvg(document); - - final Node child = document.getFirstChild(); - fixImageTagHref(document, (Element) child); - - return document; - - } - - private static DocumentBuilder getDocumentBuilder() throws ParserConfigurationException { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - return factory.newDocumentBuilder(); } private static String domToString(@NotNull Document document) throws TransformerException { @@ -202,7 +207,7 @@ public class ExporterFactory { return result.toString(); } - private void fixImageTagHref(@NotNull Document document, @NotNull Element element) { + private void inlineImages(@NotNull Document document, @NotNull Element element) { final NodeList list = element.getChildNodes(); @@ -211,7 +216,7 @@ public class ExporterFactory { // find all groups if (GROUP_NODE_NAME.equals(node.getNodeName())) { // Must continue looking .... - fixImageTagHref(document, (Element) node); + inlineImages(document, (Element) node); } else if (IMAGE_NODE_NAME.equals(node.getNodeName())) { @@ -281,68 +286,72 @@ public class ExporterFactory { } } - private static void fitSvg(Document document) { - // viewBox size - int mapWidth = 1024; - int mapHeight = 768; - // some browser return width and heigth with precision - float currentMaxWidth = 0; - float currentMaxHeight = 0; + private static void resizeSVG(@NotNull Document document) throws ExportException { - final Element svgNode = (Element) document.getFirstChild(); - final NodeList list = svgNode.getChildNodes(); + try { + XPathFactory xPathfactory = XPathFactory.newInstance(); + XPath xpath = xPathfactory.newXPath(); + XPathExpression expr = xpath.compile("/svg/g/rect"); - for (int i = 0; i < list.getLength(); i++) { - final Node node = list.item(i); - // find all groups - if (GROUP_NODE_NAME.equals(node.getNodeName())) { - final NamedNodeMap groupAttributes = node.getAttributes(); + NodeList nl = (NodeList) expr.evaluate(document, XPathConstants.NODESET); + final int length = nl.getLength(); + double maxX = 0, minX = 0, minY = 0, maxY = 0; - final String[] transformUnit = getTransformUnit(groupAttributes); - int groupPositionX = Integer.parseInt(transformUnit[0].trim()); - int groupPositionY = 0; - if (transformUnit.length > 1) { - groupPositionY = Integer.parseInt(transformUnit[1].trim()); + for (int i = 0; i < length; i++) { + final Element rectElem = (Element) nl.item(i); + final Element gElem = (Element) rectElem.getParentNode(); + + + final TransformListParser p = new TransformListParser(); + final AWTTransformProducer tp = new AWTTransformProducer(); + p.setTransformListHandler(tp); + p.parse(gElem.getAttribute("transform")); + final AffineTransform transform = tp.getAffineTransform(); + + double yPos = transform.getTranslateY(); + if (yPos > 0) { + yPos += Double.parseDouble(rectElem.getAttribute("height")); + } + maxY = maxY < yPos ? yPos : maxY; + minY = minY > yPos ? yPos : minY; + + double xPos = transform.getTranslateX(); + if (xPos > 0) { + xPos += Double.parseDouble(rectElem.getAttribute("width")); } - int signumX = Integer.signum(groupPositionX); - int signumY = Integer.signum(groupPositionY); - - final NodeList groupChildren = node.getChildNodes(); - for (int idx = 0; idx < groupChildren.getLength(); idx++) { - final Node rectNode = groupChildren.item(idx); - float curentHeight = 0; - float curentWidth = 0; - - // If has a rect use the rect to calcular the real width of the topic - if (RECT_NODE_NAME.equals(rectNode.getNodeName())) { - final NamedNodeMap rectAttributes = rectNode.getAttributes(); - - final Node attributeHeight = rectAttributes.getNamedItem("height"); - final Node attributeWidth = rectAttributes.getNamedItem("width"); - - curentHeight = Float.valueOf(attributeHeight.getNodeValue()); - curentWidth = Float.valueOf(attributeWidth.getNodeValue()); - } - - float newMaxWidth = groupPositionX + (curentWidth * signumX); - if (Math.abs(currentMaxWidth) < Math.abs(newMaxWidth)) { - currentMaxWidth = newMaxWidth; - } - - float newMaxHeight = groupPositionY + curentHeight * signumY; - if (Math.abs(currentMaxHeight) < Math.abs(newMaxHeight)) { - currentMaxHeight = newMaxHeight; - } - } + maxX = maxX < xPos ? xPos : maxX; + minX = minX > xPos ? xPos : minX; } - } - svgNode.setAttribute("viewBox", -Math.abs(currentMaxWidth) + " " + -Math.abs(currentMaxHeight) + " " + Math.abs(currentMaxWidth * 2) + " " + Math.abs(currentMaxHeight * 2)); - svgNode.setAttribute("width", Float.toString(mapWidth / 2)); - svgNode.setAttribute("height", Float.toString(mapHeight / 2)); - svgNode.setAttribute("preserveAspectRatio", "xMinYMin"); + // Add some extra margin ... + maxX += MARGING; + minX += -MARGING; + + maxY += MARGING; + minY += -MARGING; + + // Calculate dimentions ... + final double width = maxX + Math.abs(minX); + final double height = maxY + Math.abs(minY); + + // Finally, update centers ... + final Element svgNode = (Element) document.getFirstChild(); + + svgNode.setAttribute("viewBox", minX + " " + minY + " " + width + " " + height); + svgNode.setAttribute("width", Double.toString(width)); + svgNode.setAttribute("height", Double.toString(height)); + svgNode.setAttribute("preserveAspectRatio", "xMinYMin"); + } catch (XPathExpressionException e) { + throw new ExportException(e); + } catch (ParseException e) { + throw new ExportException(e); + } catch (NumberFormatException e) { + throw new ExportException(e); + } catch (DOMException e) { + throw new ExportException(e); + } } private static String[] getTransformUnit(NamedNodeMap groupAttributes) { diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java index 7857fc8d..1fb266ea 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java @@ -24,15 +24,35 @@ public class ExportTest { private static final String DATA_DIR_PATH = "src/test/resources/data/svg/"; @Test(dataProvider = "Data-Provider-Function") - public void exportSvgTest(@NotNull final File svgFile, @NotNull final File pngFile, @NotNull final File pdfFile) throws ImporterException, IOException, ExportException, TransformerException, XMLStreamException, JAXBException, SAXException, TranscoderException, ParserConfigurationException { + public void exportSvgTest(@NotNull final File svgFile, @NotNull final File pngFile, @NotNull final File pdfFile, @NotNull final File svgExpFile) throws IOException, ExportException, TranscoderException, ParserConfigurationException { - String svgXml = FileUtils.readFileToString(svgFile, "UTF-8"); + final String svgXml = FileUtils.readFileToString(svgFile, "UTF-8"); exportPng(svgFile, pngFile, svgXml); exportPdf(svgFile, pdfFile, svgXml); + exportSvg(svgFile, svgExpFile, svgXml); + } - private void exportPng(File svgFile, File pngFile, String svgXml) throws ParserConfigurationException, TranscoderException, IOException, SAXException, XMLStreamException, TransformerException, JAXBException, ExportException { + private void exportSvg(File svgFile, File pdfFile, String svgXml) throws IOException, ExportException, TranscoderException, ParserConfigurationException { + final ExportFormat format = ExportFormat.SVG; + final ExportProperties properties = ExportProperties.create(format); + + String baseUrl = svgFile.getParentFile().getAbsolutePath() + "/../../../../../../wise-editor/src/main/webapp"; + ExporterFactory factory = new ExporterFactory(new File(baseUrl)); + // Write content ... + if (pdfFile.exists()) { + // Export mile content ... + final ByteArrayOutputStream bos = new ByteArrayOutputStream(); + factory.export(properties, null, bos, svgXml); + } else { + OutputStream outputStream = new FileOutputStream(pdfFile, false); + factory.export(properties, null, outputStream, svgXml); + outputStream.close(); + } + } + + private void exportPng(File svgFile, File pngFile, String svgXml) throws ParserConfigurationException, ExportException, IOException, TranscoderException { final ExportFormat format = ExportFormat.PNG; final ExportProperties properties = ExportProperties.create(format); final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties; @@ -52,7 +72,7 @@ public class ExportTest { } } - private void exportPdf(File svgFile, File pdfFile, String svgXml) throws ParserConfigurationException, TranscoderException, IOException, SAXException, XMLStreamException, TransformerException, JAXBException, ExportException { + private void exportPdf(File svgFile, File pdfFile, String svgXml) throws ParserConfigurationException, ExportException, IOException, TranscoderException { final ExportFormat format = ExportFormat.PDF; final ExportProperties properties = ExportProperties.create(format); @@ -82,11 +102,11 @@ public class ExportTest { } }); - final Object[][] result = new Object[svgFile.length][3]; + final Object[][] result = new Object[svgFile.length][4]; for (int i = 0; i < svgFile.length; i++) { File freeMindFile = svgFile[i]; final String name = freeMindFile.getName(); - result[i] = new Object[]{freeMindFile, new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + ".png"),new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + ".pdf")}; + result[i] = new Object[]{freeMindFile, new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + ".png"), new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + ".pdf"), new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + "-exp.svg")}; } return result; diff --git a/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg b/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg new file mode 100644 index 00000000..648b34b5 --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg @@ -0,0 +1,1325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Insomnia + + + + + + + + NUTRITION/HEALTH + + + + + + + + + NUTRITION + + + + + + + + + Resist energy drinks + + + + + + + + + Take calcium, zinc and magnesium vitamins + + + + + + + + + Drink relaxing tea + + + + + + + + + Drink plenty of water + + + + + + + + + Eat food that promotes sleep + + + + + + + + + HEALTH + + + + + + + + + Get sunlight + + + + + + + + + Consult doctor + + + + + + + + + Check your thyroid + + + + + + + + + Avoid medicine that keeps you awake/alert + + + + + + + + + Address health issues + + + + + + + + + PHYSICAL + + + + + + + + + Meditate + + + + + + + + + Practice relaxation techniques + + + + + + + + + Maintain your ideal weight + + + + + + + + + Get massaged + + + + + + + + + Exercise + + + + + + + + + Spend time outside + + + + + + + + + Practice yoga + + + + + + + + + Enjoy activities during the day + + + + + + + + + Aroma therapy + + + + + + + + + SLEEP PATTERN/POSITION + + + + + + + + + BREATING + + + + + + + + + Slow down breathing + + + + + + + + + Do breathing exercises + + + + + + + + + SLEEP PATTERN + + + + + + + + + Wake up same time each day + + + + + + + + + Create bedtime ritual + + + + + + + + + Understand your sleep cycle + + + + + + + + + Tell your companions when they can wake you + + + + + + + + + Go to bed the same time every day + + + + + + + + + POSITIONING + + + + + + + + + Support body + + + + + + + + + Sleep in your bedroom and your bed + + + + + + + + + Pillow under knees + + + + + + + + + Change your position + + + + + + + + + Visit sleep clinic for problems + + + + + + + + + Children in their own bed + + + + + + + + + TO DO IN BED + + + + + + + + + RELAXATION + + + + + + + + + Repeat a mantra word + + + + + + + + + Recite favorite poems to yourself + + + + + + + + + Say your prayers + + + + + + + + + Read a thought or quote of the day + + + + + + + + + REFLEXOLOGY + + + + + + + + + Wiggle your toes + + + + + + + + + SLEEPING ACTIONS + + + + + + + + + Count backwards + + + + + + + + + Masks to cover eyes + + + + + + + + + Use ear plugs + + + + + + + + + Read a page of a day book + + + + + + + + + Count sheep + + + + + + + + + OPTIMISM/BEHAVIOR + + + + + + + + + PROBLEMS + + + + + + + + + Maintain safe environment + + + + + + + + + Acknowledge what is bothering you and let it go + + + + + + + + + Resolve disagreements + + + + + + + + + BEHAVIOR + + + + + + + + + If you can’t sleep, get up, do something until tired + + + + + + + + + Fight after dinner drowsiness + + + + + + + + + Wear comfortable sleeping clothes + + + + + + + + + Keep a sleep journal + + + + + + + + + Do some good for others + + + + + + + + + Behave well + + + + + + + + + OPTIMISIM + + + + + + + + + Keep a gratefulness diary/journal + + + + + + + + + Know you have the power to solve your problems + + + + + + + + + Think positively – you are going to have a good night’s sleep + + + + + + + + + Imagine something happy + + + + + + + + + Think positively and be happy + + + + + + + + + BEDROOM + + + + + + + + + Make bedroom sleep sanctuary + + + + + + + + + Reserve bed and bedroom for sleep, love and reading + + + + + + + + + ENVIRONMENT + + + + + + + + + Comfortable humidity + + + + + + + + + Let sunshine in + + + + + + + + + RELAXATION + + + + + + + + + Listen to a relaxation CD that shuts off by itself + + + + + + + + + Eucalyptus twigs in a bed stand vase + + + + + + + + + Scented candles + + + + + + + + + Keep bedroom neat without clutter + + + + + + + + + BED + + + + + + + + + Clean bedding + + + + + + + + + Bedding colors and textures should be soothing and peaceful + + + + + + + + + INTERIOR DESIGN + + + + + + + + + Peaceful, calm décor + + + + + + + + + Have an aquarium with fish + + + + + + + + + Select peaceful wall hangings + + + + + + + + + Arrange furniture to block light + + + + + + + + + Cool and dark + + + + + + + + + Have plants + + + + + + + + + Room darkening shades + + + + + + + + + Walls painted in restful colors + + + + + + + + + No technology in room (television, computer) + + + + + + + + + Low watt bulbs + + + + + + + + + White noise machine + + + + + + + + + NEAR BED + + + + + + + + + Water on bed stand + + + + + + + + + Place clock out of arm’s reach + + + + + + + + + Comfort items organized neatly near bed + + + + + + + + + BEFORE GOING TO BED + + + + + + + + + FOOD AND DRINKS + + + + + + + + + Drink a glass of warm milk + + + + + + + + + Have rosebud tea + + + + + + + + + Eat foods with tryptophan + + + + + + + + + DE-STRESSING + + + + + + + + + Write problems on paper and leave them there + + + + + + + + + Avoid emotional discussions + + + + + + + + + Stop watching television an hour before bedtime + + + + + + + + + RELAXATION + + + + + + + + + Turn off your mobile phone + + + + + + + + + Massage or cuddle with your loved one + + + + + + + + + Take a warm bath or shower + + + + + + + + + Have sex + + + + + + + + + Brush and floss your teeth + + + + + + + + + Use the bathroom + + + + + + + + + Take a sleep aid suggested by doctor + + + + + + + + + Use a flashlight to use the bathroom + + + + + + + + + DON'T + + + + + + + + + Smoke + + + + + + + + + Alcohol + + + + + + + + + Nap too much + + + + + + + + + Be angry + + + + + + + + + Watch/read news before bed + + + + + + + + + Eat a lot before bed + + + + + + + + + Sleep on the couch + + + + + + + + + No pets + + + + + + + + + Avoid eating + + + + + + + + + Avoid upsetting activities like bill paying + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/bug-nbsp.pdf b/wise-webapp/src/test/resources/data/svg/bug-nbsp.pdf index cb5c03b6..89ce8cb5 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug-nbsp.pdf and b/wise-webapp/src/test/resources/data/svg/bug-nbsp.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/bug-nbsp.png b/wise-webapp/src/test/resources/data/svg/bug-nbsp.png index 885f2ea5..ea327287 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug-nbsp.png and b/wise-webapp/src/test/resources/data/svg/bug-nbsp.png differ diff --git a/wise-webapp/src/test/resources/data/svg/bug1-exp.svg b/wise-webapp/src/test/resources/data/svg/bug1-exp.svg new file mode 100644 index 00000000..0e8315f4 --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/bug1-exp.svg @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Diseño de Paginas WEB + + + + + + + + Ventajas y Beneficios + + + + + + + + + + + Obtención de clientes y contactos + + + + + + + + + + + Imagen corporativa + + + + + + + + + + + Informa + + + + + + + + + + + Internacionalización + + + + + + + + + + + Captación + + + + + + + + + + + Fidelización + + + + + + + + + + + Nuevos clientes + + + + + + + + + + + MARKETING + + + + + + + + + + + son una herramienta de: + + + + + + + + + Tipos de Paginas WEB + + + + + + + + + + + Por su audiencia + + + + + + + + + + + Públicos + + + + + + + + + + + Extranet + + + + + + + + + Intranet + + + + + + + + + Por su dinamismo + + + + + + + + + + + Por su estructura + + + + + + + + + + + Sitios Interactivos + + + + + + + + + + + Sitios estáticos + + + + + + + + + + + Por su profundidad + + + + + + + + + + + Por sus objetivos + + + + + + + + + + + Comerciales + + + + + + + + + + + Informativos + + + + + + + + + + + Ocio + + + + + + + + + + + Navegación + + + + + + + + + + + Artísticos + + + + + + + + + + + Personales + + + + + + + + + + + Por su apertura + + + + + + + + + + + abierta + + + + + + + + + cerrada + + + + + + + + + semicerrada + + + + + + + + + Importancia + + + + + + + + + internet + + + + + + + + + + + medio de difusion + + + + + + + + + + + popular + + + + + + + + + + + economico + + + + + + + + + + + Atractivas + + + + + + + + + Combinacion de Colores + + + + + + + + + + + contraste + + + + + + + + + significado de colores + + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/bug1.pdf b/wise-webapp/src/test/resources/data/svg/bug1.pdf index 99449864..8e655938 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug1.pdf and b/wise-webapp/src/test/resources/data/svg/bug1.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/bug1.png b/wise-webapp/src/test/resources/data/svg/bug1.png index 94de3e50..a6750237 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug1.png and b/wise-webapp/src/test/resources/data/svg/bug1.png differ diff --git a/wise-webapp/src/test/resources/data/svg/bug2-exp.svg b/wise-webapp/src/test/resources/data/svg/bug2-exp.svg new file mode 100644 index 00000000..fd607f20 --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/bug2-exp.svg @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Script_Bro_P1 + + + + + + + + ??????favor + + + + + + + + + enter + + + + + + + + + ??/???????? + + + + + + + + + exit + + + + + + + + + ???????????? + + + + + + + + + ?????????? + + + + + + + + + ???????????? + + + + + + + + + ????????? + + + + + + + + + ????????? + + + + + + + + + ?????????X? + + + + + + + + + ??-->?????? + + + + + + + + + ???? + + + + + + + + + ????? + + + + + + + + + ??-->???? + + + + + + + + + ??tab + + + + + + + + + ???>???????->???? + + + + + + + + + ???>????->javascript + + + + + + + + + ???>??>?????? + + + + + + + + + ???>????>???? + + + + + + + + + ??????? + + + + + + + + + Browser ?call?SM??? + + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/bug2.pdf b/wise-webapp/src/test/resources/data/svg/bug2.pdf index 51f2283f..c6c959c5 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug2.pdf and b/wise-webapp/src/test/resources/data/svg/bug2.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/bug2.png b/wise-webapp/src/test/resources/data/svg/bug2.png index cb07ee19..02181b8d 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug2.png and b/wise-webapp/src/test/resources/data/svg/bug2.png differ diff --git a/wise-webapp/src/test/resources/data/svg/bug3-exp.svg b/wise-webapp/src/test/resources/data/svg/bug3-exp.svg new file mode 100644 index 00000000..32a25e4a --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/bug3-exp.svg @@ -0,0 +1,4379 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Connections B + + + + + + + + The Northern Gannet + + + + + + + + + flute + + + + + + + + + middle school + + + + + + + + + lockers + + + + + + + + + new territory + + + + + + + + + university + + + + + + + + + streets + + + + + + + + + walking + + + + + + + + + zombies + + + + + + + + + apocalypse + + + + + + + + + the day after tomorrow + + + + + + + + + exercise + + + + + + + + + weekends + + + + + + + + + independence + + + + + + + + + growing up + + + + + + + + + nunavut + + + + + + + + + co-op + + + + + + + + + cold + + + + + + + + + intimidation + + + + + + + + + bears + + + + + + + + + baseball + + + + + + + + + diamonds + + + + + + + + + engagement + + + + + + + + + ring + + + + + + + + + fingers + + + + + + + + + fetish + + + + + + + + + scales + + + + + + + + + piano + + + + + + + + + nail polish + + + + + + + + + manicures + + + + + + + + + telephone + + + + + + + + + marilyn monroe + + + + + + + + + blonde + + + + + + + + + perfection + + + + + + + + + white dress + + + + + + + + + tiffany's + + + + + + + + + breakfast at + + + + + + + + + audrey hepburn + + + + + + + + + classy + + + + + + + + + black & white + + + + + + + + + wine + + + + + + + + + parties + + + + + + + + + night club + + + + + + + + + weekends + + + + + + + + + bomber + + + + + + + + + stereotypical + + + + + + + + + camping + + + + + + + + + solitude + + + + + + + + + woods + + + + + + + + + cabin + + + + + + + + + joss whedon + + + + + + + + + avengers + + + + + + + + + super powers + + + + + + + + + sky high + + + + + + + + + what would you rather? + + + + + + + + + high school games + + + + + + + + + dots + + + + + + + + + brain damaged + + + + + + + + + firefly + + + + + + + + + cult + + + + + + + + + hiking + + + + + + + + + boots + + + + + + + + + rain + + + + + + + + + waterloo + + + + + + + + + hurricane sandy + + + + + + + + + blackout + + + + + + + + + boyfriend + + + + + + + + + justin bieber + + + + + + + + + one direction + + + + + + + + + self-esteem + + + + + + + + + depression + + + + + + + + + treatable + + + + + + + + + suicide + + + + + + + + + believe + + + + + + + + + silver linings + + + + + + + + + jennifer lawrence + + + + + + + + + the hunger games + + + + + + + + + cloud watching + + + + + + + + + up! + + + + + + + + + dreams + + + + + + + + + sleep + + + + + + + + + future + + + + + + + + + back to the future + + + + + + + + + wild west + + + + + + + + + serene + + + + + + + + + picnics + + + + + + + + + pop culture + + + + + + + + + sarcasm + + + + + + + + + perez hilton + + + + + + + + + high pitched + + + + + + + + + falsetto + + + + + + + + + glass shattering + + + + + + + + + fat lady + + + + + + + + + narrator + + + + + + + + + flocks + + + + + + + + + coffee table book + + + + + + + + + caffeine + + + + + + + + + energy + + + + + + + + + crash + + + + + + + + + manga + + + + + + + + + ottawa + + + + + + + + + canada + + + + + + + + + home + + + + + + + + + is whenever I'm with you + + + + + + + + + music + + + + + + + + + indie + + + + + + + + + bluesfest + + + + + + + + + edward sharpe + + + + + + + + + twilight + + + + + + + + + breaking dawn + + + + + + + + + almost over + + + + + + + + + universally ridiculed + + + + + + + + + kardashians + + + + + + + + + kristen stewart + + + + + + + + + home sweet home + + + + + + + + + cross stitch + + + + + + + + + candy house + + + + + + + + + gingerbread + + + + + + + + + hansel & gretel witch + + + + + + + + + once upon a time + + + + + + + + + sundays + + + + + + + + + breakfast + + + + + + + + + church + + + + + + + + + potluck + + + + + + + + + must catch up + + + + + + + + + running + + + + + + + + + races + + + + + + + + + horses + + + + + + + + + riding boots + + + + + + + + + fall + + + + + + + + + bad egg + + + + + + + + + allergies + + + + + + + + + for life + + + + + + + + + dopestrong + + + + + + + + + behind + + + + + + + + + homework + + + + + + + + + procrastination + + + + + + + + + parliament + + + + + + + + + downtown + + + + + + + + + the market + + + + + + + + + bargaining + + + + + + + + + negotiation + + + + + + + + + males vs. females + + + + + + + + + allowance + + + + + + + + + childhood + + + + + + + + + monsters under the bed + + + + + + + + + sketch + + + + + + + + + comedy + + + + + + + + + Ana Soler + + + + + + + + + motion + + + + + + + + + stop motion + + + + + + + + + tim burton + + + + + + + + + tennis + + + + + + + + + racket + + + + + + + + + noise + + + + + + + + + sound + + + + + + + + + sonic boom + + + + + + + + + hedgehogs + + + + + + + + + needles + + + + + + + + + pine trees + + + + + + + + + christmas + + + + + + + + + countdowns + + + + + + + + + anticipation + + + + + + + + + video games + + + + + + + + + courts + + + + + + + + + law + + + + + + + + + judge + + + + + + + + + opinions + + + + + + + + + gossip + + + + + + + + + gossip girl + + + + + + + + + tv shows + + + + + + + + + seasonal + + + + + + + + + holidays + + + + + + + + + christmas + + + + + + + + + halloween + + + + + + + + + allergies + + + + + + + + + death + + + + + + + + + ghosts + + + + + + + + + hospitals + + + + + + + + + cancer + + + + + + + + + peanuts + + + + + + + + + comics + + + + + + + + + manga + + + + + + + + + confrontation + + + + + + + + + negotiation + + + + + + + + + weakness + + + + + + + + + interviews + + + + + + + + + kryptonite + + + + + + + + + eggs + + + + + + + + + sunnyside up + + + + + + + + + library + + + + + + + + + favourite spaces + + + + + + + + + tlc + + + + + + + + + books made into movies + + + + + + + + + harry potter + + + + + + + + + fond childhood + + + + + + + + + magic + + + + + + + + + sleepless in seattle + + + + + + + + + the hunger games + + + + + + + + + dystopian + + + + + + + + + archery + + + + + + + + + life or death + + + + + + + + + time traveler's wife + + + + + + + + + romance + + + + + + + + + love + + + + + + + + + love at first sight + + + + + + + + + mystic + + + + + + + + + exists? + + + + + + + + + chivalry + + + + + + + + + bygone eras + + + + + + + + + star-crossed lovers + + + + + + + + + tragedy + + + + + + + + + hamlet + + + + + + + + + plays + + + + + + + + + theatre + + + + + + + + + opera + + + + + + + + + falsetto + + + + + + + + + broadway + + + + + + + + + new york city + + + + + + + + + landscapes + + + + + + + + + paintings + + + + + + + + + scenery + + + + + + + + + beauty + + + + + + + + + memorable + + + + + + + + + 9/11 + + + + + + + + + lightbulb memory + + + + + + + + + shakespeare + + + + + + + + + inventor of words + + + + + + + + + evolution of english language + + + + + + + + + tears + + + + + + + + + catharsis + + + + + + + + + oedipus rex + + + + + + + + + mother complex + + + + + + + + + purging + + + + + + + + + spring cleaning + + + + + + + + + bulimia + + + + + + + + + women + + + + + + + + + illness + + + + + + + + + rumors + + + + + + + + + adele + + + + + + + + + singing + + + + + + + + + voice + + + + + + + + + grapevine + + + + + + + + + vine yard + + + + + + + + + bottle shock + + + + + + + + + life ruining + + + + + + + + + unplanned pregnancy + + + + + + + + + sicknesses + + + + + + + + + reputation + + + + + + + + + word of mouth + + + + + + + + + bad boy/good boy + + + + + + + + + litigation + + + + + + + + + forensics + + + + + + + + + csi + + + + + + + + + miami + + + + + + + + + beaches + + + + + + + + + sunscreen + + + + + + + + + tans + + + + + + + + + life guards + + + + + + + + + volleyball + + + + + + + + + police officers + + + + + + + + + donuts + + + + + + + + + sirens + + + + + + + + + mermaids + + + + + + + + + enchantments + + + + + + + + + disney + + + + + + + + + halloween costumes + + + + + + + + + shipwrecks + + + + + + + + + treasure island + + + + + + + + + classic books + + + + + + + + + map making + + + + + + + + + art exhibit + + + + + + + + + museums + + + + + + + + + museum project + + + + + + + + + travelling + + + + + + + + + backpacking + + + + + + + + + explorers + + + + + + + + + map making + + + + + + + + + darwin + + + + + + + + + survival of the fittest + + + + + + + + + cliches + + + + + + + + + dora + + + + + + + + + children + + + + + + + + + birth + + + + + + + + + past + + + + + + + + + ghosts + + + + + + + + + halloween + + + + + + + + + scary movies + + + + + + + + + faster + + + + + + + + + cars + + + + + + + + + accidents + + + + + + + + + cooking + + + + + + + + + smart + + + + + + + + + good grades + + + + + + + + + clever + + + + + + + + + fox + + + + + + + + + similes + + + + + + + + + history of their conception + + + + + + + + + cookies + + + + + + + + + repetition + + + + + + + + + how kids learn + + + + + + + + + focus + + + + + + + + + attention span + + + + + + + + + camera + + + + + + + + + flash + + + + + + + + + super heroes + + + + + + + + + save the world + + + + + + + + + photography + + + + + + + + + hobby + + + + + + + + + crafts + + + + + + + + + Klutz + + + + + + + + + first love + + + + + + + + + talent + + + + + + + + + party tricks + + + + + + + + + singing + + + + + + + + + life style + + + + + + + + + magazine + + + + + + + + + healthy living + + + + + + + + + eat well + + + + + + + + + work well + + + + + + + + + sleep well + + + + + + + + + instagram + + + + + + + + + apps + + + + + + + + + iPhone 5 + + + + + + + + + foreign + + + + + + + + + films + + + + + + + + + artsy + + + + + + + + + "different" + + + + + + + + + Why we broke up book + + + + + + + + + accents + + + + + + + + + understandable + + + + + + + + + Gloria + + + + + + + + + Modern Family + + + + + + + + + accent colours + + + + + + + + + interior decor + + + + + + + + + Justin Timberlake + + + + + + + + + diaries + + + + + + + + + feelings + + + + + + + + + magazines + + + + + + + + + fashion + + + + + + + + + coco chanel + + + + + + + + + home decor + + + + + + + + + interior design + + + + + + + + + martha stewart + + + + + + + + + tv show + + + + + + + + + jail + + + + + + + + + arthur + + + + + + + + + after school programs + + + + + + + + + pinterest + + + + + + + + + internet startups + + + + + + + + + dropbox + + + + + + + + + competitions + + + + + + + + + sports + + + + + + + + + cloud data + + + + + + + + + tanning + + + + + + + + + skin cancer + + + + + + + + + personal + + + + + + + + + life record + + + + + + + + + helena bonham carter + + + + + + + + + crazy hair + + + + + + + + + johnny depp + + + + + + + + + scruff + + + + + + + + + childhood crushes + + + + + + + + + elementary school + + + + + + + + + sherlock holmes + + + + + + + + + britain + + + + + + + + + olympics + + + + + + + + + big ben + + + + + + + + + english accents + + + + + + + + + tea + + + + + + + + + typical + + + + + + + + + broken promises + + + + + + + + + heart break + + + + + + + + + all packaged kits + + + + + + + + + beauty boxes + + + + + + + + + solid business model + + + + + + + + + start ups + + + + + + + + + angel investments + + + + + + + + + tears + + + + + + + + + fathers + + + + + + + + + male complex + + + + + + + + + vegetables + + + + + + + + + weekly grocery shopping + + + + + + + + + REM + + + + + + + + + 9 + + + + + + + + + boybands + + + + + + + + + longevity + + + + + + + + + comedy + + + + + + + + + snl + + + + + + + + + animated movie + + + + + + + + + hayao miyazaki + + + + + + + + + first person + + + + + + + + + novels + + + + + + + + + i + + + + + + + + + nanowrimo + + + + + + + + + late starts + + + + + + + + + track and field + + + + + + + + + quantity + + + + + + + + + probability + + + + + + + + + self-obsessed + + + + + + + + + me generation + + + + + + + + + baby boomers + + + + + + + + + electronics + + + + + + + + + statistics + + + + + + + + + professors + + + + + + + + + painful + + + + + + + + + break + + + + + + + + + academia + + + + + + + + + phd + + + + + + + + + food + + + + + + + + + apples + + + + + + + + + nutrition + + + + + + + + + great american novel + + + + + + + + + on the road + + + + + + + + + cross canada + + + + + + + + + railways + + + + + + + + + scenery + + + + + + + + + favourite artists + + + + + + + + + stars + + + + + + + + + regina spektor + + + + + + + + + marina & the diamonds + + + + + + + + + 424 fluency + + + + + + + + + + + + + WHISPERED SECRETS + + + + + + + + + + + + + QUALITY TV SHOW REFERENCES + + + + + + + + + + + + + RESPONSIBILITY + + + + + + + + + + + + + INSTAGRAMED LATTES + + + + + + + + + SELF-CONSCIOUS SHOWER SINGING + + + + + + + + + + + + + DISCOVERING CITY HEARTS + + + + + + + + + 379 flexibility + + + + + + + + + + + + + MIDWIVE TALES TO SCARE CHILDREN + + + + + + + + + + + + + + + + + 8 convergence + + + + + + + + + + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/bug3.pdf b/wise-webapp/src/test/resources/data/svg/bug3.pdf index ebd3a1bd..69a60e1e 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug3.pdf and b/wise-webapp/src/test/resources/data/svg/bug3.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/bug3.png b/wise-webapp/src/test/resources/data/svg/bug3.png index 5c37b8f8..ae975710 100644 Binary files a/wise-webapp/src/test/resources/data/svg/bug3.png and b/wise-webapp/src/test/resources/data/svg/bug3.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map-3.0-exp.svg b/wise-webapp/src/test/resources/data/svg/map-3.0-exp.svg new file mode 100644 index 00000000..638b2ab7 --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map-3.0-exp.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + aaaa + + + + + + + + Main Topic + + + + + + + + + Main Topic + + + + + + + + + Main Topic + + + + + + + + + Main Topic + + + + + + + + + Main Topic + + + + + + + + + Main Topic + + + + + + + + + Main Topic + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Main Topic + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/map-3.0.pdf b/wise-webapp/src/test/resources/data/svg/map-3.0.pdf index 20d8416f..b36de2ae 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map-3.0.pdf and b/wise-webapp/src/test/resources/data/svg/map-3.0.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map-3.0.png b/wise-webapp/src/test/resources/data/svg/map-3.0.png index 24f5858a..80f20ff6 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map-3.0.png and b/wise-webapp/src/test/resources/data/svg/map-3.0.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map1-exp.svg b/wise-webapp/src/test/resources/data/svg/map1-exp.svg new file mode 100644 index 00000000..a399e0ea --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map1-exp.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Aval de la Municipalidad + + + + + + + + + + Es bueno ser parte ? + + + + + + + Empresario Argentino pone plata ? + + + + + + + Medianas + + + + + + + Grandes + + + + + + + Chicas + + + + + + + Tama??o + + + + + + + Precio Razonable + + + + + + + Tipo + + + + + + + Target + + + + + + + Mercado + + + + + + Dudas? + + + + + + + + Pagina Web + + + + + + + SETI ? + + + + + + + Mail + + + + + + + Networking + + + + + + + Infraestructura + + + + + + + Innovacion + + + + + + + Balance de Sueldo + + + + + + + Sueldo + + + + + + + Contaduria + + + + + + + Servicios + + + + + + + Sistemas + + + + + + Servicios + + + + + + + + Acesoramiento de Internet + + + + + + + Es tan fuerte ? + + + + + + + + + + Web Lista (Gratuita) + + + + + + + + + + Municipalidad + + + + + + + Ezeiza + + + diff --git a/wise-webapp/src/test/resources/data/svg/map1.pdf b/wise-webapp/src/test/resources/data/svg/map1.pdf index 3bf6ebda..eda5f656 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map1.pdf and b/wise-webapp/src/test/resources/data/svg/map1.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map1.png b/wise-webapp/src/test/resources/data/svg/map1.png index 6f62ff77..c1f675d0 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map1.png and b/wise-webapp/src/test/resources/data/svg/map1.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map2-exp.svg b/wise-webapp/src/test/resources/data/svg/map2-exp.svg new file mode 100644 index 00000000..bcd40a6b --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map2-exp.svg @@ -0,0 +1,1590 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + International market + protected Modelo from unstable peso + + + + + + + Can they sustain that trend + + + + + + + in 12 years + + + + + + + Fifth largest distributor in + world + + + + + + + One of top 10 breweries in + world + + + + + + Modelo in world + + + + + + + + working there since 13 + + + + + + + 29 years old + + + + + + + CEO Since 1997 + + + + + + + experienced local + distributors + + + + + + + Growing international demand + + + + + + + Capitalize on NAFTA + + + + + + + International Business model + + + + + + + 7.8 % sales growth compounded + over ten years + + + + + + + 12.3 % exports + + + + + + + 4% increase domestically + + + + + + + export sales 30% + + + + + + + 2005 + + + + + + + worlds fourth best selling + beer + + + + + + + 56% shar of domestic market + + + + + + + outsold competitor by 50% + + + + + + + Since 1997 #1 import in US + + + + + + + Corona Extra + + + + + + + top 10 beer producers in + world + + + + + + + vision: top five brewers + + + + + + + renovate facility in + Zacatecas + + + + + + + 300 million investment + + + + + + + Expanding production + + + + + + Carloz Fernandez CEO + + + + + + + + 2nd largest nest to China + + + + + + + Consumption six times higher + per cap + + + + + + + Groth expectations reduced + + + + + + + 75% of industry profits + + + + + + + AB + + + + + + + adolf coors + + + + + + + Miller + + + + + + + 80% of market + + + + + + + dense network of regional + craft brewing + + + + + + + volume main driver + + + + + + US Beer Market + + + + + + + + Pablo Diez Fernandez, Braulio + Irare, Marin Oyamburr + + + + + + + Iriarte died in 1932 + + + + + + + Diez sole owner 1936 + + + + + + + Fernandez Family Sole owner + since 1936 + + + + + + + formed in 1922 + + + + + + + focus on Mexico City + + + + + + + Modelo 1st Brand + + + + + + + Clear Glass Customers + preference + + + + + + + Corona 2nd Brand + + + + + + + concentrate domesti¬cally + + + + + + + distribution: direct with + profit sharing + + + + + + + improve distribution methods + and produc¬tion facilities + + + + + + + 1940s period of strong growth + + + + + + + 1935 + + + + + + + country's oldest brand of + beer + + + + + + + bought the brands and assets + of the Toluca y Mexico Brewery + + + + + + + History to 1970 + + + + + + + Mexican Stock exchange in + 1994 + + + + + + + The 50.2 % represented 43.9% + voting + + + + + + + Anheuser-Busch 17.7 % of the + equity + + + + + + + 1971, Antonino Fernandez was + appointed CEO + + + + + + + corona 56% share + + + + + + + Largest Beer producer and + distrubutor in Mexico + + + + + + Modelo in Mexico + + + + + + + + 1979 + + + + + + + later renamed Barton Beers + Ltd. + + + + + + + Amalgamated Distillery + Products Inc. ( + + + + + + + gained popularity in southern + states + + + + + + + second most popular imported + beer + + + + + + + rapid growth 1980s + + + + + + + sales decrease of 15 percent + + + + + + + distributor absorb the tax 92 + + + + + + + doubling of federal excise + tax on beer + + + + + + + distributors took the loss + + + + + + + 1991 + + + + + + + History + + + + + + + 3 of top 8 beers in US + + + + + + + Main Import Comptitor + + + + + + + Heineken + + + + + + + 131 million cases + + + + + + + 2007 5 beers to us + + + + + + + surfing mythology + + + + + + + not selling premium quality + + + + + + + not testosterone driven + + + + + + + found new following + + + + + + + beer for non beer drinkers + + + + + + + dependable second choise + + + + + + + Barton Beer's idea + + + + + + + escape + + + + + + + relaxation + + + + + + + Fun in the sun + + + + + + + Corona 5.1 mil + + + + + + + Heiniken 15 mil + + + + + + + an bsch 192 mil + + + + + + + 1996ad budget + + + + + + + Marketing + + + + + + + Local Companies + + + + + + + Autonomous + + + + + + + competitive relationship + + + + + + + transportation + + + + + + + insurance + + + + + + + pricing + + + + + + + customs + + + + + + + advertixing + + + + + + + importer/distributors + + + + + + + Modelo us subsidiary + + + + + + + Support + + + + + + + Supervise + + + + + + + Coordinate + + + + + + + procermex inc + + + + + + + Modelo had final say on brand + image + + + + + + + production in Mexico + + + + + + + largest importer in 25 + western states + + + + + + + Chicago based Barton Beers + 1st + + + + + + + 1986 + + + + + + + eastern dist + + + + + + + Gambrinus + + + + + + + Us dist contracts + + + + + + + Modelo in US + + + + + + + traditionally a clustered + market + + + + + + + many local breweries + + + + + + + no means of transport + + + + + + + colsolition happened in 1800s + + + + + + + different countries had + different tastes + + + + + + + 90s national leaders expanded + abroad + + + + + + + industry supported + conectration + + + + + + + startup costs high + + + + + + + Belgian + + + + + + + aquired breweries in 20 + countries + + + + + + + sales in 110 countries + + + + + + + local managers controlling + brands + + + + + + + flagship brand: Stella Artois + + + + + + + Interbrew + + + + + + + #1 Interbrew + + + + + + + #5 Am Bev - Brazil + + + + + + + worth 12.8 billion + + + + + + + largest merge + + + + + + + 2004 merger + + + + + + + inbev + + + + + + + SAP Miller + + + + + + + marketing + + + + + + + import taxes passed on to + consumer + + + + + + + importing + + + + + + + distribution + + + + + + + parent of local distributors + + + + + + + produces beer domestically + + + + + + + premium brand + + + + + + + no mythology + + + + + + + superior taste + + + + + + + Heineken Premium Light + + + + + + + 2006 aggressive marketing + campaign + + + + + + + marketing + + + + + + + reputation of top selling + beer in world + + + + + + + Dutch + + + + + + + Heineken + + + + + + + produces in foreign markets + + + + + + + Anh Bush + + + + + + + 2007 + + + + + + + "People drink marketing" + + + + + + + Beer Marketing + + + + + + + domestic and foreign threats + + + + + + + other merger talks + + + + + + + Two biggest companies will + create huge company + + + + + + + Inbev in talks with Anh Bush + + + + + + + Sales were decreasing due to + competitive media budgets + + + + + + + Future + + + + + + + The Beer market + + + + + + corona + + + + + + + has most trade agreements in + world + + + + + + + one of the largest domestic + beer markets + + + + + + + half were anh bcsh dist by + modelo + + + + + + + imported beer only 1% sales + + + + + + + NAFTA S.A. An Bucsh + + + + + + + 62.8% of market + + + + + + + modelo + + + + + + + 37% of domestic market + + + + + + + production and distribution + in Mexico: peso not a threat + + + + + + + CA largest chain of conv + stores + + + + + + + Owns Oxxo C + + + + + + + leads domestic premium beer + market + + + + + + + 997 to 2004 taking domestic + market share + + + + + + + Exclusive distributor + + + + + + + NAFTA SACoca cola + + + + + + + domestic market + + + + + + + Distribution in US + + + + + + + Partnership Heiniken + + + + + + + 90s entry to us market failed + + + + + + + 2005 18.7% growth + + + + + + + Recently partnered with + Heiniken for US market + + + + + + + foriegn market + + + + + + + FEMSA + + + + + + + Mexico Industry + + + + diff --git a/wise-webapp/src/test/resources/data/svg/map2.pdf b/wise-webapp/src/test/resources/data/svg/map2.pdf index 3b653088..00bdc28e 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map2.pdf and b/wise-webapp/src/test/resources/data/svg/map2.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map2.png b/wise-webapp/src/test/resources/data/svg/map2.png index e7ab7550..0cfb3f15 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map2.png and b/wise-webapp/src/test/resources/data/svg/map2.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map3-exp.svg b/wise-webapp/src/test/resources/data/svg/map3-exp.svg new file mode 100644 index 00000000..a9923f14 --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map3-exp.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accesible desde todos lados + + + + + + + Mobile + + + + + + + widget + + + + + + + Posibilidad de acceso desde la + pagina insitucional + + + + + + + Pay per use + + + + + + + porque? + + + + + + web + + + + + + + + + + + Cobrar por calculo? + + + + + + + No lo usan por varios meses + + + + + + + costo mensual? + + + + + + + vender el servicio no el software + + + + + + + cobro por servicio? + + + + + + Plan de Negocio + + + + + + + + + + + ascTimeTable + + + + + + + + + + + lantiv + + + + + + + + + Competencia + + + + + + + + + + + embeddable widget + + + + + + + mobile + + + + + + + Very intuitive + + + + + + + ability to create custom rules + + + + + + + Distribuido + + + + + + + Algorithm + + + + + + + clipboard + + + + + + + excel + + + + + + + csv + + + + + + + import + + + + + + + clipboard + + + + + + + excel + + + + + + + csv + + + + + + + export + + + + + + Features + + + + + + + + + + timetable + + + diff --git a/wise-webapp/src/test/resources/data/svg/map3.pdf b/wise-webapp/src/test/resources/data/svg/map3.pdf index 8ee84c3c..4145c48f 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map3.pdf and b/wise-webapp/src/test/resources/data/svg/map3.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map3.png b/wise-webapp/src/test/resources/data/svg/map3.png index d5d98d2a..9b833f7d 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map3.png and b/wise-webapp/src/test/resources/data/svg/map3.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map4-exp.svg b/wise-webapp/src/test/resources/data/svg/map4-exp.svg new file mode 100644 index 00000000..43905182 --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map4-exp.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accesible desde todos lados + + + + + + + Mobile + + + + + + + widget + + + + + + + Posibilidad de acceso desde la + pagina insitucional + + + + + + + Pay per use + + + + + + + porque? + + + + + + web + + + + + + + + + + + Cobrar por calculo? + + + + + + + No lo usan por varios meses + + + + + + + costo mensual? + + + + + + + vender el servicio no el software + + + + + + + cobro por servicio? + + + + + + Plan de Negocio + + + + + + + + + + + ascTimeTable + + + + + + + + + + + lantiv + + + + + + + + + Competencia + + + + + + + + + + + embeddable widget + + + + + + + mobile + + + + + + + Very intuitive + + + + + + + ability to create custom rules + + + + + + + Distribuido + + + + + + + Algorithm + + + + + + + clipboard + + + + + + + excel + + + + + + + csv + + + + + + + import + + + + + + + clipboard + + + + + + + excel + + + + + + + csv + + + + + + + export + + + + + + Features + + + + + + + + + + timetable + + + diff --git a/wise-webapp/src/test/resources/data/svg/map4.pdf b/wise-webapp/src/test/resources/data/svg/map4.pdf index 364a532d..a8d08166 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map4.pdf and b/wise-webapp/src/test/resources/data/svg/map4.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map4.png b/wise-webapp/src/test/resources/data/svg/map4.png index c38a5bae..8ebf135e 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map4.png and b/wise-webapp/src/test/resources/data/svg/map4.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map5-exp.svg b/wise-webapp/src/test/resources/data/svg/map5-exp.svg new file mode 100644 index 00000000..9456291f --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map5-exp.svg @@ -0,0 +1,20 @@ + + + + + + + t + + + + + + Main Topic + + + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/map5.pdf b/wise-webapp/src/test/resources/data/svg/map5.pdf index dff43035..92f8741a 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map5.pdf and b/wise-webapp/src/test/resources/data/svg/map5.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map5.png b/wise-webapp/src/test/resources/data/svg/map5.png index 079a3bb9..65148eda 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map5.png and b/wise-webapp/src/test/resources/data/svg/map5.png differ diff --git a/wise-webapp/src/test/resources/data/svg/map6-exp.svg b/wise-webapp/src/test/resources/data/svg/map6-exp.svg new file mode 100644 index 00000000..dad6979d --- /dev/null +++ b/wise-webapp/src/test/resources/data/svg/map6-exp.svg @@ -0,0 +1,1723 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PPM Plan + + + + + + + + Community Outreach + + + + + + + + + Probono + + + + + + + + + Sub Topic + + + + + + + + + Backlog Management + + + + + + + + + + + Client Project Management + + + + + + + + + Human Resources + + + + + + + + + + + Freeform IT + + + + + + + + + Administration + + + + + + + + + Freeform IT Plan + + + + + + + + + Fragile + + + + + + + + + Tools + + + + + + + + + Learning Needs Plan + + + + + + + + + Governance & Executive + + + + + + + + + Sub Topic + + + + + + + + + Finance + + + + + + + + + Freeform Hosting + + + + + + + + + Business Development + + + + + + + + + R&D + + + + + + + + + Goals + + + + + + + + + Formulize + + + + + + + + + Strategy 2: Talent Development + + + + + + + + + + + Strategic Priority 2a: Personal Plans + + + + + + + + + + + Strategic Priority 2b: External learning matches organ. goals + + + + + + + + + + + Strategic Priority 2c: Learning Environment + + + + + + + + + + + So That... + + + + + + + + + + + + Strategy 1: Recruit & Retain + + + + + + + + + + + So that... + + + + + + + + + + + Strategic Priority 1a: Recruitment + + + + + + + + + + + Modify App Form + + + + + + + + + + + Strategy integrated with hiring plan + + + + + + + + + + + Strategic Priority 1b: Hiring + + + + + + + + + + + Strategic Priority 1c: Onboarding + + + + + + + + + + + 3 Month Onboarding Process + + + + + + + + + Tools & Guidelines + + + + + + + + + Mentoring + + + + + + + + + Strategic Priority 1d: Incentives + + + + + + + + + + + Raises + + + + + + + + + Benefits + + + + + + + + + Rewards Message + + + + + + + + + + + Strategic Priority 1e: Offboarding + + + + + + + + + + + Business Development Plan + + + + + + + + + Target + + + + + + + + + Goals + + + + + + + + + Increase new clients + + + + + + + + + Academic Research + + + + + + + + + Strategy 4: Inclusive, Positive Environment + + + + + + + + + + + Strategic Priority 4a:Feedback + + + + + + + + + + + Strategic Priority 4b: Anti Harassment + + + + + + + + + + + Strategic Priority 4c: Diversity + + + + + + + + + + + Sub Topic + + + + + + + + + So That... + + + + + + + + + + + + Sub Topic + + + + + + + + + Support New Products + + + + + + + + + Formulize + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Support CiviCRM + + + + + + + + + Identify Opportunites + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Sub Topic + + + + + + + + + Hosting NG Plan + + + + + + + + + Project Teams + + + + + + + + + Projects 1-3 + + + + + + + + + Projects 4-6 + + + + + + + + + Projects 7 & 8 + + + + + + + + + General Work + + + + + + + + + Restructure + + + + + + + + + Client Centric Process + + + + + + + + + Freeform Project Process + + + + + + + + + Supportive Systems Plan + + + + + + + + + Board and C Planning + + + + + + + + + Mission Statements + + + + + + + + + + + Values + + + + + + + + + Bylaw Review + + + + + + + + + Policies + + + + + + + + + Business Plan + + + + + + + + + Strategy 3: Safety and Wellness + + + + + + + + + + + Strategic Priority 3a: H&S Policies & Practices + + + + + + + + + + + Sub Topic + + + + + + + + + Strategic Priority 3b: Health Promotion + + + + + + + + + + + Health and Wellness Committee + + + + + + + + + + + Work-life Balance Initiative + + + + + + + + + + + So that... + + + + + + + + + + + + Benefits + + + + + + + + + + + As Freeform Staff + + + + + + + + + + + Responsibility: HZ, JC + + + + + + + + + Release 3 + + + + + + + + + + + Have Heather create list benefits against Best Practice & cost + + + + + + + + + + + Have Jason review list + + + + + + + + + + + Have JC & HZ consult with staff + + + + + + + + + + + Have best benefits we can afford + + + + + + + + + + + So that... + + + + + + + + + + + + Community Outreach Plan + + + + + + + + + Goals + + + + + + + + + CSI + + + + + + + + + Drupal Community + + + + + + + + + CiviCRM + + + + + + + + + Other + + + + + + + + + Backlog Plan + + + + + + + + + + + Go To Backlog Plan + + + + + + + + + + + + Strategies Marketing + + + + + + + + + Isolated Topic + + + + + + + + + Exit Interviews + + + + + + + + + As Freeform + + + + + + + + + + + Responsiblity: HZ, KS + + + + + + + + + Release + + + + + + + + + + + Have Heather write procedures for exit interview process + + + + + + + + + So that + + + + + + + + + + + + 3 Month Onboarding Process + + + + + + + + + Human Resources Plan + + + + + + + + + Related Org Objectives + + + + + + + + + 1 + + + + + + + + + + + 2 + + + + + + + + + + + 3 + + + + + + + + + + + 4 + + + + + + + + + + + Related Documents + + + + + + + + + + + Goals + + + + + + + + + Goal:Staff=Optimal Bus. Growth + + + + + + + + + + + + So that... + + + + + + + + + + + Related Strategic Priorities: + + + + + + + + + KPI: HR Level equals Planned Growth + + + + + + + + + + + Methodology + + + + + + + + + + + Target + + + + + + + + + + + Goal: Increase Job Satisfaction + + + + + + + + + So That + + + + + + + + + + + + Related Strategic Priorities + + + + + + + + + Sub Topic + + + + + + + + + KPI: Employee Satisfaction + + + + + + + + + + + Sub Topic + + + + + + + + + Methodology + + + + + + + + + + + Target + + + + + + + + + + + Goal: Improve Performance + + + + + + + + + + + + So That + + + + + + + + + + + + Related Strategic Priorities + + + + + + + + + + + KPI: Employee Performance + + + + + + + + + + + Methodology + + + + + + + + + Target + + + + + + + + + Goal: Reduce Turnover + + + + + + + + + + + + So That + + + + + + + + + + + + Related Strategic Priorities + + + + + + + + + KPI: Retention Rate + + + + + + + + + + + Methodology + + + + + + + + + Risk & Compliance + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wise-webapp/src/test/resources/data/svg/map6.pdf b/wise-webapp/src/test/resources/data/svg/map6.pdf index 3df39a0f..3d90b6cb 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map6.pdf and b/wise-webapp/src/test/resources/data/svg/map6.pdf differ diff --git a/wise-webapp/src/test/resources/data/svg/map6.png b/wise-webapp/src/test/resources/data/svg/map6.png index f5d1a434..b63acdd5 100644 Binary files a/wise-webapp/src/test/resources/data/svg/map6.png and b/wise-webapp/src/test/resources/data/svg/map6.png differ