Merge pull request #472 from OnroerendErfgoed/develop

release 0.31.1

dist/commonjs/copy-button/copy-button.d.ts

@@ -1,5 +1,6 @@
 export declare class CopyButton {
     element: HTMLElement;
+    clipboardTitle: string;
     showCheckIcon: boolean;
     copy(): void;
     private hideCheckIcon;

dist/commonjs/copy-button/copy-button.html

@@ -1 +1 @@
-<template><require from="./styles/copy-button.css"></require><button class="copy-icon-container ${showCheckIcon ? 'tooltipped tooltipped-n m-2 p-2 border' : ''}" aria-label="${showCheckIcon ? 'Gekopieerd!' : ''}" click.delegate="copy()"><i class="fa fa-clipboard" title="Kopiëren" if.bind="!showCheckIcon"></i> <i class="copy-icon fa fa-check" if.bind="showCheckIcon"></i></button></template>
+<template><require from="./styles/copy-button.css"></require><button class="copy-icon-container ${showCheckIcon ? 'tooltipped tooltipped-n m-2 p-2 border' : ''}" aria-label="${showCheckIcon ? 'Gekopieerd!' : ''}" click.delegate="copy()"><i class="fa fa-clipboard" title.bind="clipboardTitle" if.bind="!showCheckIcon"></i> <i class="copy-icon fa fa-check" if.bind="showCheckIcon"></i></button></template>

dist/commonjs/zoneerder/components/ol-map.d.ts

@@ -1,5 +1,5 @@
 import ol from 'openlayers';
-import { Contour, IAlignerResponse, ReferentielaagEnum, StrategieEnum } from '../models/contour';
+import { Contour, IAlignerResponse, IGeometryObject, ReferentielaagEnum, StrategieEnum } from '../models/contour';
 import { CrabService } from '../../services/crab.api-service';
 import { IZoneerderServiceConfig } from 'exports';
 import { DialogService } from 'aurelia-dialog';
@@ -19,7 +19,7 @@ export declare class OlMap extends BaseMap {
     showSelectGebouw: boolean;
     alignerAreaLimit: number;
     initialLaatstGealigneerd: string;
-    geometryObjectList: string[];
+    geometryObjectList: IGeometryObject[];
     WKTstring: string;
     protected isDrawing: boolean;
     protected isDrawingCircle: boolean;
@@ -31,6 +31,7 @@ export declare class OlMap extends BaseMap {
     private polygonIndex;
     private circleIndex;
     private totalArea;
+    private wktFormat;
     constructor(element: Element, crabService: CrabService, dialogService: DialogService);
     attached(): void;
     private addZoneToDrawLayer;

dist/commonjs/zoneerder/components/ol-map.html

@@ -1 +1 @@
-<template><require from="openlayers/dist/ol.css"></require><require from="./layerswitcher.css"></require><div ref="mapnode" class="map"><div class="geolocation ol-unselectable ol-control" if.bind="buttonConfig.zoomGeoLocation"><button title="Zoom naar je geolocatie" click.delegate="geoLocationClick()"></button></div><div class="zoom-switcher ol-unselectable ol-control" if.bind="buttonConfig.zoomSwitcher"><button class="zoomButton" title="Ga naar het Geoportaal" click.delegate="zoomButtonClick()"><i class="fa fa-globe"></i></button></div><div class="${isCollapsed ? 'sidebar-collapsed' : 'sidebar'}" if.bind="!disabled"><div><a class="collapse-icon" click.delegate="isCollapsed = !isCollapsed"><i class="fa fa-lg fa-list"></i></a><h4 class="collapse-title" if.bind="!isCollapsed">Zone samenstellen</h4></div><div if.bind="!isCollapsed" style="overflow-y:auto"><div class="toevoegen-aan"><h5>Toevoegen aan zone</h5><a click.delegate="!isDrawing ? startDrawZone('Polygon') : toggleDrawZone(false)"><span if.bind="!isDrawing"><i class="fa fa-pencil"></i> Teken polygoon</span> <span else><i class="fa fa-ban"></i> Annuleer tekenen</span> </a><a click.delegate="!isDrawingCircle ? startDrawZone('Circle') : toggleDrawZone(false)"><span if.bind="!isDrawingCircle"><i class="fa fa-pencil"></i> Teken cirkel</span> <span else><i class="fa fa-ban"></i> Annuleer tekenen</span> </a><a click.delegate="!selectPerceel ? startPerceelSelect() : resetSelect()"><span if.bind="!selectPerceel"><i class="fa fa-hand-pointer-o"></i> Selecteer perceel</span> <span else><i class="fa fa-ban"></i> Annuleer perceel</span> </a><a if.bind="showSelectGebouw" click.delegate="!selectGebouw ? startGebouwSelect() : resetSelect()"><span if.bind="!selectGebouw"><i class="fa fa-hand-pointer-o"></i> Selecteer gebouw</span> <span else><i class="fa fa-ban"></i> Annuleer gebouw</span> </a><a click.delegate="importAdrespunten()" if.bind="adrespunten && adrespunten.length > 0"><span><i class="fa fa-link"></i> Neem over van adrespunten</span></a><div class="row collapse"><div class="small-9 columns"><input type="text" value.bind="WKTstring" placeholder="WKT string (Lambert72)"></div><div class="small-3 columns"><button class="button tiny postfix" title="Plaats" click.delegate="drawWKTzone(WKTstring)">Plaats</button></div></div></div><div class="toegevoegde-zones" show.bind="geometryObjectList.length > 0"><h4>Toegevoegde zones</h4><ul><li repeat.for="geometryObject of geometryObjectList"><div class="small-10 columns"> ${geometryObject} </div><div class="small-2 columns"><i click.delegate="removeGeometryObject(geometryObject)" class="fa fa-trash"></i></div></li></ul></div><template if.bind="showGrbTool"><a if.bind="totalArea && totalArea <= alignerAreaLimit" click.delegate="showZoneVergelijkingDialog()"><span><i class="fa fa-pencil"></i> Vergelijk zone met referentielaag</span> </a><span if.bind="initialLaatstGealigneerd" class="laatst-gealigneerd-container">Laatst gealigneerd op: ${formatDate(initialLaatstGealigneerd)} </span><div class="alert-box alert" if.bind="totalArea > alignerAreaLimit"><p style="font-size:14px">Oppervlakte: ${totalArea}m²</p><p style="font-size:14px">De oppervlakte van het object is te groot (>${alignerAreaLimit} m²) om de autocorrectie uit te voeren via de webbrowser. Contacteer je GIS beheerder om deze zone aan te passen.</p></div></template></div></div></div></template>
+<template><require from="openlayers/dist/ol.css"></require><require from="./layerswitcher.css"></require><require from="../../copy-button"></require><div ref="mapnode" class="map"><div class="geolocation ol-unselectable ol-control" if.bind="buttonConfig.zoomGeoLocation"><button title="Zoom naar je geolocatie" click.delegate="geoLocationClick()"></button></div><div class="zoom-switcher ol-unselectable ol-control" if.bind="buttonConfig.zoomSwitcher"><button class="zoomButton" title="Ga naar het Geoportaal" click.delegate="zoomButtonClick()"><i class="fa fa-globe"></i></button></div><div class="${isCollapsed ? 'sidebar-collapsed' : 'sidebar'}" if.bind="!disabled"><div><a class="collapse-icon" click.delegate="isCollapsed = !isCollapsed"><i class="fa fa-lg fa-list"></i></a><h4 class="collapse-title" if.bind="!isCollapsed">Zone samenstellen</h4></div><div if.bind="!isCollapsed" style="overflow-y:auto"><div class="toevoegen-aan"><h5>Toevoegen aan zone</h5><a click.delegate="!isDrawing ? startDrawZone('Polygon') : toggleDrawZone(false)"><span if.bind="!isDrawing"><i class="fa fa-pencil"></i> Teken polygoon</span> <span else><i class="fa fa-ban"></i> Annuleer tekenen</span> </a><a click.delegate="!isDrawingCircle ? startDrawZone('Circle') : toggleDrawZone(false)"><span if.bind="!isDrawingCircle"><i class="fa fa-pencil"></i> Teken cirkel</span> <span else><i class="fa fa-ban"></i> Annuleer tekenen</span> </a><a click.delegate="!selectPerceel ? startPerceelSelect() : resetSelect()"><span if.bind="!selectPerceel"><i class="fa fa-hand-pointer-o"></i> Selecteer perceel</span> <span else><i class="fa fa-ban"></i> Annuleer perceel</span> </a><a if.bind="showSelectGebouw" click.delegate="!selectGebouw ? startGebouwSelect() : resetSelect()"><span if.bind="!selectGebouw"><i class="fa fa-hand-pointer-o"></i> Selecteer gebouw</span> <span else><i class="fa fa-ban"></i> Annuleer gebouw</span> </a><a click.delegate="importAdrespunten()" if.bind="adrespunten && adrespunten.length > 0"><span><i class="fa fa-link"></i> Neem over van adrespunten</span></a><div class="row collapse"><div class="small-9 columns"><input type="text" value.bind="WKTstring" placeholder="WKT string (Lambert72)"></div><div class="small-3 columns"><button class="button tiny postfix" title="Plaats" click.delegate="drawWKTzone(WKTstring)">Plaats</button></div></div></div><div class="toegevoegde-zones" show.bind="geometryObjectList.length > 0"><h4>Toegevoegde zones</h4><ul><li repeat.for="geometryObject of geometryObjectList"><div class="small-9 columns"> ${geometryObject.name} </div><div class="small-3 columns"><div style="float:left"><span ref="elementRef" show.bind="false">${geometryObject.wktString}</span><copy-button if.bind="geometryObject.wktString" clipboard-title.bind="'Kopieer WKT string'" element.bind="elementRef"></copy-button></div><div style="float:right"><i click.delegate="removeGeometryObject(geometryObject.name)" class="fa fa-trash"></i></div></div></li></ul></div><template if.bind="showGrbTool"><a if.bind="totalArea && totalArea <= alignerAreaLimit" click.delegate="showZoneVergelijkingDialog()"><span><i class="fa fa-pencil"></i> Vergelijk zone met referentielaag</span> </a><span if.bind="initialLaatstGealigneerd" class="laatst-gealigneerd-container">Laatst gealigneerd op: ${formatDate(initialLaatstGealigneerd)} </span><div class="alert-box alert" if.bind="totalArea > alignerAreaLimit"><p style="font-size:14px">Oppervlakte: ${totalArea}m²</p><p style="font-size:14px">De oppervlakte van het object is te groot (>${alignerAreaLimit} m²) om de autocorrectie uit te voeren via de webbrowser. Contacteer je GIS beheerder om deze zone aan te passen.</p></div></template></div></div></div></template>