From 607e8c199a2c65c0acb55cd07e7f75caeca005b1 Mon Sep 17 00:00:00 2001 From: ziajka Date: Mon, 21 May 2018 13:02:48 +0200 Subject: [PATCH] Small clean --- .../svg-to-drawing-converter/svg-converter.ts | 5 --- .../helpers/svg-to-drawing-converter.spec.ts | 2 +- .../helpers/svg-to-drawing-converter.ts | 2 +- .../ellipse-converter.spec.ts | 0 .../ellipse-converter.ts | 2 +- .../image-converter.spec.ts | 0 .../image-converter.ts | 2 +- .../line-converter.spec.ts | 0 .../line-converter.ts | 2 +- .../rect-converter.spec.ts | 0 .../rect-converter.ts | 2 +- .../svg-to-drawing-converter/svg-converter.ts | 5 +++ .../text-converter.spec.ts | 0 .../text-converter.ts | 2 +- .../cartography/shared/widgets/drawings.ts | 42 +++---------------- 15 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 src/app/cartography/map/helpers/svg-to-drawing-converter/svg-converter.ts rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter.spec.ts (95%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter.ts (95%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts (100%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/ellipse-converter.ts (93%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/image-converter.spec.ts (100%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/image-converter.ts (88%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/line-converter.spec.ts (100%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/line-converter.ts (92%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/rect-converter.spec.ts (100%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/rect-converter.ts (93%) create mode 100644 src/app/cartography/shared/helpers/svg-to-drawing-converter/svg-converter.ts rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/text-converter.spec.ts (100%) rename src/app/cartography/{map => shared}/helpers/svg-to-drawing-converter/text-converter.ts (92%) 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 deleted file mode 100644 index ef817327..00000000 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter/svg-converter.ts +++ /dev/null @@ -1,5 +0,0 @@ -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.spec.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter.spec.ts similarity index 95% rename from src/app/cartography/map/helpers/svg-to-drawing-converter.spec.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter.spec.ts index 2963ff78..cec9559b 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter.spec.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter.spec.ts @@ -1,5 +1,5 @@ import { SvgToDrawingConverter } from "./svg-to-drawing-converter"; -import { TextElement } from "../../shared/models/drawings/text-element"; +import { TextElement } from "../models/drawings/text-element"; describe('SvgToDrawingHelper', () => { diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter.ts similarity index 95% rename from src/app/cartography/map/helpers/svg-to-drawing-converter.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter.ts index d9d94959..8653c0c0 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter.ts @@ -1,5 +1,5 @@ import { Injectable } from "@angular/core"; -import { DrawingElement } from "../../shared/models/drawings/drawing-element"; +import { DrawingElement } from "../models/drawings/drawing-element"; import { SvgConverter } from "./svg-to-drawing-converter/svg-converter"; import { TextConverter } from "./svg-to-drawing-converter/text-converter"; import { ImageConverter } from "./svg-to-drawing-converter/image-converter"; diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts similarity index 100% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/ellipse-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.ts similarity index 93% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/ellipse-converter.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.ts index 390be264..435d689b 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter/ellipse-converter.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.ts @@ -1,5 +1,5 @@ import { SvgConverter } from "./svg-converter"; -import { EllipseElement } from "../../../shared/models/drawings/ellipse-element"; +import { EllipseElement } from "../../models/drawings/ellipse-element"; export class EllipseConverter implements SvgConverter { diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/image-converter.spec.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.spec.ts similarity index 100% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/image-converter.spec.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.spec.ts diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/image-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.ts similarity index 88% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/image-converter.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.ts index 3511f073..e0d9ed5c 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter/image-converter.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.ts @@ -1,5 +1,5 @@ import { SvgConverter } from "./svg-converter"; -import { ImageElement } from "../../../shared/models/drawings/image-element"; +import { ImageElement } from "../../models/drawings/image-element"; export class ImageConverter implements SvgConverter { diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/line-converter.spec.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.spec.ts similarity index 100% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/line-converter.spec.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.spec.ts diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/line-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.ts similarity index 92% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/line-converter.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.ts index aff0927a..a8227f0d 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter/line-converter.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.ts @@ -1,5 +1,5 @@ import { SvgConverter } from "./svg-converter"; -import { LineElement } from "../../../shared/models/drawings/line-element"; +import { LineElement } from "../../models/drawings/line-element"; export class LineConverter implements SvgConverter { diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/rect-converter.spec.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.spec.ts similarity index 100% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/rect-converter.spec.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.spec.ts diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/rect-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.ts similarity index 93% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/rect-converter.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.ts index 56069266..8815c960 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter/rect-converter.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.ts @@ -1,5 +1,5 @@ import { SvgConverter } from "./svg-converter"; -import { RectElement } from "../../../shared/models/drawings/rect-element"; +import { RectElement } from "../../models/drawings/rect-element"; export class RectConverter implements SvgConverter { diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/svg-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/svg-converter.ts new file mode 100644 index 00000000..7d052681 --- /dev/null +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter/svg-converter.ts @@ -0,0 +1,5 @@ +import { DrawingElement } from "../../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.spec.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.spec.ts similarity index 100% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.spec.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.spec.ts diff --git a/src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts b/src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.ts similarity index 92% rename from src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts rename to src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.ts index 04dc7360..78180d40 100644 --- a/src/app/cartography/map/helpers/svg-to-drawing-converter/text-converter.ts +++ b/src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.ts @@ -1,5 +1,5 @@ import { SvgConverter } from "./svg-converter"; -import { TextElement } from "../../../shared/models/drawings/text-element"; +import { TextElement } from "../../models/drawings/text-element"; export class TextConverter implements SvgConverter { diff --git a/src/app/cartography/shared/widgets/drawings.ts b/src/app/cartography/shared/widgets/drawings.ts index 6b9a907d..62004fa1 100644 --- a/src/app/cartography/shared/widgets/drawings.ts +++ b/src/app/cartography/shared/widgets/drawings.ts @@ -1,9 +1,9 @@ -import {Widget} from "./widget"; -import {Drawing} from "../models/drawing"; -import {SVGSelection} from "../models/types"; -import {Layer} from "../models/layer"; +import { Widget } from "./widget"; +import { Drawing } from "../models/drawing"; +import { SVGSelection } from "../models/types"; +import { Layer } from "../models/layer"; import { TextDrawingWidget } from "./drawings/text-drawing"; -import { SvgToDrawingConverter } from "../../map/helpers/svg-to-drawing-converter"; +import { SvgToDrawingConverter } from "../helpers/svg-to-drawing-converter"; import { ImageDrawingWidget } from "./drawings/image-drawing"; import { RectDrawingWidget } from "./drawings/rect-drawing"; import { LineDrawingWidget } from "./drawings/line-drawing"; @@ -37,38 +37,6 @@ export class DrawingsWidget implements Widget { .append('g') .attr('class', 'drawing'); - // const parser = new DOMParser(); - - // const drawing_image = drawing_enter.append('image') - // .attr('xlink:href', (d: Drawing) => { - // let svg = d.svg; - // if (svg.indexOf("xmlns") < 0) { - // svg = svg.replace('svg', 'svg xmlns="http://www.w3.org/2000/svg"'); - // } - // - // return 'data:image/svg+xml;base64,' + btoa(svg); - // }) - // .attr('width', (d: Drawing) => { - // const svg_dom = parser.parseFromString(d.svg, 'text/xml'); - // const roots = svg_dom.getElementsByTagName('svg'); - // if (roots.length > 0) { - // if (roots[0].hasAttribute('width')) { - // return roots[0].getAttribute('width'); - // } - // } - // return 0; - // }) - // .attr('height', (d: Drawing) => { - // const svg_dom = parser.parseFromString(d.svg, 'text/xml'); - // const roots = svg_dom.getElementsByTagName('svg'); - // if (roots.length > 0) { - // if (roots[0].hasAttribute('height')) { - // return roots[0].getAttribute('height'); - // } - // } - // return 0; - // }); - const drawing_merge = drawing.merge(drawing_enter) .attr('transform', (d: Drawing) => { return `translate(${d.x},${d.y})`;