From 44f4388e4125cca6a5624b0ad5c9ba13770e1291 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Mon, 14 May 2018 15:05:56 +0200
Subject: [PATCH] Init SvgToDrawingConverter

---
 .../helpers/svg-to-drawing-converter.spec.ts  | 35 ++++++++++++++
 .../map/helpers/svg-to-drawing-converter.ts   | 47 +++++++++++++++++++
 .../svg-to-drawing-converter/svg-converter.ts |  5 ++
 .../text-converter.ts                         | 15 ++++++
 .../shared/models/drawings/drawing-element.ts |  4 ++
 .../shared/models/drawings/text-element.ts    | 12 +++++
 .../cartography/shared/widgets/drawings.ts    |  2 +-
 7 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 src/app/cartography/map/helpers/svg-to-drawing-converter.spec.ts
 create mode 100644 src/app/cartography/map/helpers/svg-to-drawing-converter.ts
 create mode 100644 src/app/cartography/map/helpers/svg-to-drawing-converter/svg-converter.ts
 create mode 100644 src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts
 create mode 100644 src/app/cartography/shared/models/drawings/drawing-element.ts
 create mode 100644 src/app/cartography/shared/models/drawings/text-element.ts

diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter.spec.ts b/src/app/cartography/map/helpers/svg-to-drawing-converter.spec.ts
new file mode 100644
index 00000000..ca53d8de
--- /dev/null
+++ b/src/app/cartography/map/helpers/svg-to-drawing-converter.spec.ts
@@ -0,0 +1,35 @@
+import { SvgToDrawingConverter } from "./svg-to-drawing-converter";
+
+
+describe('SvgToDrawingHelper', () => {
+  let svgToDrawingConverter: SvgToDrawingConverter;
+
+  beforeEach(() => {
+    svgToDrawingConverter = new SvgToDrawingConverter();
+  });
+
+  it('should raise Error on empty string', () => {
+    expect(() => svgToDrawingConverter.convert("")).toThrowError(Error);
+  });
+
+  it('should raise Error on no children', () => {
+    expect(() => svgToDrawingConverter.convert("<svg></svg>")).toThrowError(Error);
+  });
+
+    it('should raise Error on unknown parser', () => {
+    expect(() => svgToDrawingConverter.convert("<svg><unkown></unkown></svg>")).toThrowError(Error);
+  });
+
+  it('should parse text drawing', () => {
+    const svg = '<svg height="53" width="78">' +
+      '<text fill="#000000" fill-opacity="1.0" font-family="TypeWriter" font-size="10.0" font-weight="bold">' +
+      'Line' +
+      '</text>' +
+      '</svg>';
+
+    const drawing = svgToDrawingConverter.convert(svg);
+
+    expect(drawing.width).toBe(78);
+    expect(drawing.height).toBe(53);
+  });
+});
diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter.ts b/src/app/cartography/map/helpers/svg-to-drawing-converter.ts
new file mode 100644
index 00000000..21f326ac
--- /dev/null
+++ b/src/app/cartography/map/helpers/svg-to-drawing-converter.ts
@@ -0,0 +1,47 @@
+import { Injectable } from "@angular/core";
+import { DrawingElement } from "../../shared/models/drawings/drawing-element";
+import { SvgConverter } from "./svg-to-drawing-converter/svg-converter";
+import { TextConverter } from "./svg-to-drawing-converter/text-converter";
+
+
+@Injectable()
+export class SvgToDrawingConverter {
+  private parser: DOMParser;
+  private elementParsers: { [key: string]: SvgConverter };
+
+  constructor() {
+    this.parser = new DOMParser();
+    this.elementParsers = {
+      'text': new TextConverter()
+    };
+  }
+
+  convert(svg: string): DrawingElement {
+    const svgDom = this.parser.parseFromString(svg, 'text/xml');
+    const roots = svgDom.getElementsByTagName('svg');
+    if (roots.length !== 1) {
+      throw new Error(`Cannot locate svg element root in '${svg}'`);
+    }
+    const svgRoot = roots[0];
+
+    const child = svgRoot.firstChild;
+    if (!child) {
+      throw new Error(`Cannot find first child in '${svg}`);
+    }
+
+    const name = child.nodeName;
+    if (!(name in this.elementParsers)) {
+      throw new Error(`Cannot find parser for '${name}'`);
+    }
+
+    const parser = this.elementParsers[name];
+    const drawing = parser.convert(child);
+
+    drawing.width = +svgRoot.getAttribute('width');
+    drawing.height = +svgRoot.getAttribute('height');
+
+    return drawing;
+  }
+
+
+}
diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/svg-converter.ts b/src/app/cartography/map/helpers/svg-to-drawing-converter/svg-converter.ts
new file mode 100644
index 00000000..ef817327
--- /dev/null
+++ b/src/app/cartography/map/helpers/svg-to-drawing-converter/svg-converter.ts
@@ -0,0 +1,5 @@
+import { DrawingElement } from "../../../shared/models/drawings/drawing-element";
+
+export interface SvgConverter {
+  convert(node: Node): DrawingElement;
+}
diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts b/src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts
new file mode 100644
index 00000000..8c0bdc6e
--- /dev/null
+++ b/src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts
@@ -0,0 +1,15 @@
+import { SvgConverter } from "./svg-converter";
+import { DrawingElement } from "../../../shared/models/drawings/drawing-element";
+import { TextElement } from "../../../shared/models/drawings/text-element";
+
+
+export class TextConverter implements SvgConverter {
+  convert(node: Node): DrawingElement {
+    const drawing = new TextElement();
+    const fill = node.attributes.getNamedItem('fill');
+    if (fill) {
+      drawing.fill = fill.value;
+    }
+    return drawing;
+  }
+}
diff --git a/src/app/cartography/shared/models/drawings/drawing-element.ts b/src/app/cartography/shared/models/drawings/drawing-element.ts
new file mode 100644
index 00000000..320531d5
--- /dev/null
+++ b/src/app/cartography/shared/models/drawings/drawing-element.ts
@@ -0,0 +1,4 @@
+export interface DrawingElement {
+  width: number;
+  height: number;
+}
diff --git a/src/app/cartography/shared/models/drawings/text-element.ts b/src/app/cartography/shared/models/drawings/text-element.ts
new file mode 100644
index 00000000..df17e650
--- /dev/null
+++ b/src/app/cartography/shared/models/drawings/text-element.ts
@@ -0,0 +1,12 @@
+import { DrawingElement } from "./drawing-element";
+
+
+export class TextElement implements DrawingElement {
+  height: number;
+  width: number;
+  fill: string;
+  fill_opacity: string;
+  font_family: string;
+  font_size: string;
+  font_weight: number;
+}
diff --git a/src/app/cartography/shared/widgets/drawings.ts b/src/app/cartography/shared/widgets/drawings.ts
index 6c2c24b6..f729b92b 100644
--- a/src/app/cartography/shared/widgets/drawings.ts
+++ b/src/app/cartography/shared/widgets/drawings.ts
@@ -42,7 +42,7 @@ export class DrawingsWidget implements Widget {
           return 0;
         })
         .attr('height', (d: Drawing) => {
-         const svg_dom = parser.parseFromString(d.svg, 'text/xml');
+          const svg_dom = parser.parseFromString(d.svg, 'text/xml');
           const roots = svg_dom.getElementsByTagName('svg');
           if (roots.length > 0) {
             if (roots[0].hasAttribute('height')) {