diff --git a/src/app/components/local-server/local-server.component.spec.ts b/src/app/components/local-server/local-server.component.spec.ts index 5440f27f..665f0850 100644 --- a/src/app/components/local-server/local-server.component.spec.ts +++ b/src/app/components/local-server/local-server.component.spec.ts @@ -7,7 +7,7 @@ import { MockedServerService } from '../../services/server.service.spec'; import { Server } from '../../models/server'; -fdescribe('LocalServerComponent', () => { +describe('LocalServerComponent', () => { let component: LocalServerComponent; let fixture: ComponentFixture; let router: any; diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index 8c28a128..30414de7 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -59,7 +59,6 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public server: Server; public selectedDrawing: string; private ws: Subject; - private image; tools = { selection: true, @@ -364,16 +363,20 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } private readImageFile(fileInput) { - var file: File = fileInput.files[0]; - var fileReader: FileReader = new FileReader(); + let file: File = fileInput.files[0]; + let fileReader: FileReader = new FileReader(); + let imageToUpload = new Image(); - fileReader.onloadend = (e) => { - this.image = fileReader.result; - let svg = `\n\n`; - this.drawingService.add(this.server, this.project.project_id, 0, 0, svg).subscribe(() => {}); + fileReader.onloadend = () => { + let image = fileReader.result; + let svg = `\n\n`; + this.drawingService.add(this.server, this.project.project_id, -(imageToUpload.width/2), -(imageToUpload.height/2), svg).subscribe(() => {}); } - - fileReader.readAsDataURL(file); + + imageToUpload.onload = () => { fileReader.readAsDataURL(file) }; + imageToUpload.src = window.URL.createObjectURL(file); } public ngOnDestroy() {