Merge pull request #5110 from vvlladd28/bug/typo/leadflet
[3.3.1] UI: Delete custom type leaflet-editable, add default @types/leaflet-editable
This commit is contained in:
Igor Kulikov
GitHub
commit
e7860cf01e
@ -113,6 +113,7 @@
|
|||||||
"@types/js-beautify": "^1.13.1",
|
"@types/js-beautify": "^1.13.1",
|
||||||
"@types/jstree": "^3.3.40",
|
"@types/jstree": "^3.3.40",
|
||||||
"@types/leaflet": "1.5.17",
|
"@types/leaflet": "1.5.17",
|
||||||
|
"@types/leaflet-editable": "^1.2.1",
|
||||||
"@types/leaflet-polylinedecorator": "^1.6.0",
|
"@types/leaflet-polylinedecorator": "^1.6.0",
|
||||||
"@types/leaflet.markercluster": "^1.4.4",
|
"@types/leaflet.markercluster": "^1.4.4",
|
||||||
"@types/lodash": "^4.14.170",
|
"@types/lodash": "^4.14.170",
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "../out-tsc/app",
|
"outDir": "../out-tsc/app",
|
||||||
"types": ["node", "jquery", "flot", "tooltipster", "tinycolor2", "js-beautify",
|
"types": ["node", "jquery", "flot", "tooltipster", "tinycolor2", "js-beautify",
|
||||||
"react", "react-dom", "jstree", "raphael", "canvas-gauges", "leaflet", "leaflet.markercluster"]
|
"react", "react-dom", "jstree", "raphael", "canvas-gauges", "leaflet", "leaflet.markercluster", "leaflet-editable"]
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"fullTemplateTypeCheck": true
|
"fullTemplateTypeCheck": true
|
||||||
|
|||||||
275
ui-ngx/src/typings/leadflet-editable.d.ts
vendored
275
ui-ngx/src/typings/leadflet-editable.d.ts
vendored
@ -1,275 +0,0 @@
|
|||||||
///
|
|
||||||
/// Copyright © 2016-2021 The Thingsboard Authors
|
|
||||||
///
|
|
||||||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
/// you may not use this file except in compliance with the License.
|
|
||||||
/// You may obtain a copy of the License at
|
|
||||||
///
|
|
||||||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
///
|
|
||||||
/// Unless required by applicable law or agreed to in writing, software
|
|
||||||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
/// See the License for the specific language governing permissions and
|
|
||||||
/// limitations under the License.
|
|
||||||
///
|
|
||||||
|
|
||||||
import * as leaflet from 'leaflet';
|
|
||||||
|
|
||||||
declare module 'leaflet' {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make geometries editable in Leaflet.
|
|
||||||
*
|
|
||||||
* This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to
|
|
||||||
* control editing of geometries. So you can easily build your own UI with your own needs and choices.
|
|
||||||
*/
|
|
||||||
interface EditableStatic {
|
|
||||||
new (map: Map, options: EditOptions): Editable;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Options to pass to L.Editable when instanciating.
|
|
||||||
*/
|
|
||||||
interface EditOptions extends leaflet.MapOptions{
|
|
||||||
/**
|
|
||||||
* Whether to create a L.Editable instance at map init or not.
|
|
||||||
*/
|
|
||||||
editable: boolean;
|
|
||||||
/**
|
|
||||||
* Class to be used when creating a new Polyline.
|
|
||||||
*/
|
|
||||||
polylineClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used when creating a new Polygon.
|
|
||||||
*/
|
|
||||||
polygonClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used when creating a new Marker.
|
|
||||||
*/
|
|
||||||
markerClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* CSS class to be added to the map container while drawing.
|
|
||||||
*/
|
|
||||||
drawingCSSClass?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Layer used to store edit tools (vertex, line guide…).
|
|
||||||
*/
|
|
||||||
editLayer?: LayerGroup<leaflet.Layer>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default layer used to store drawn features (marker, polyline…).
|
|
||||||
*/
|
|
||||||
featuresLayer?: LayerGroup<Polyline|Polygon|Marker>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used as vertex, for path editing.
|
|
||||||
*/
|
|
||||||
vertexMarkerClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used as middle vertex, pulled by the user to create a new point in the middle of a path.
|
|
||||||
*/
|
|
||||||
middleMarkerClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used as Polyline editor.
|
|
||||||
*/
|
|
||||||
polylineEditorClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used as Polygon editor.
|
|
||||||
*/
|
|
||||||
polygonEditorClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class to be used as Marker editor.
|
|
||||||
*/
|
|
||||||
markerEditorClass?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Options to be passed to the line guides.
|
|
||||||
*/
|
|
||||||
lineGuideOptions?: object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set this to true if you don't want middle markers.
|
|
||||||
*/
|
|
||||||
skipMiddleMarkers?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make geometries editable in Leaflet.
|
|
||||||
*
|
|
||||||
* This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to
|
|
||||||
* control editing of geometries. So you can easily build your own UI with your own needs and choices.
|
|
||||||
*/
|
|
||||||
interface Editable extends leaflet.Evented {
|
|
||||||
/**
|
|
||||||
* Options to pass to L.Editable when instanciating.
|
|
||||||
*/
|
|
||||||
options: EditOptions;
|
|
||||||
|
|
||||||
currentPolygon: Polyline|Polygon|Marker;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start drawing a polyline. If latlng is given, a first point will be added. In any case, continuing on user
|
|
||||||
* click. If options is given, it will be passed to the polyline class constructor.
|
|
||||||
*/
|
|
||||||
startPolyline(latLng?: LatLng, options?: PolylineOptions): Polyline;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start drawing a polygon. If latlng is given, a first point will be added. In any case, continuing on user
|
|
||||||
* click. If options is given, it will be passed to the polygon class constructor.
|
|
||||||
*/
|
|
||||||
startPolygon(latLng?: LatLng, options?: PolylineOptions): Polygon;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start adding a marker. If latlng is given, the marker will be shown first at this point. In any case, it
|
|
||||||
* will follow the user mouse, and will have a final latlng on next click (or touch). If options is given,
|
|
||||||
* it will be passed to the marker class constructor.
|
|
||||||
*/
|
|
||||||
startMarker(latLng?: LatLng, options?: MarkerOptions): Marker;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When you need to stop any ongoing drawing, without needing to know which editor is active.
|
|
||||||
*/
|
|
||||||
stopDrawing(): void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When you need to commit any ongoing drawing, without needing to know which editor is active.
|
|
||||||
*/
|
|
||||||
commitDrawing(): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
let Editable: EditableStatic;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EditableMixin is included to L.Polyline, L.Polygon and L.Marker. It adds the following methods to them.
|
|
||||||
*
|
|
||||||
* When editing is enabled, the editor is accessible on the instance with the editor property.
|
|
||||||
*/
|
|
||||||
interface EditableMixin {
|
|
||||||
/**
|
|
||||||
* Enable editing, by creating an editor if not existing, and then calling enable on it.
|
|
||||||
*/
|
|
||||||
enableEdit(map: L.Map): any;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Disable editing, also remove the editor property reference.
|
|
||||||
*/
|
|
||||||
disableEdit(): void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enable or disable editing, according to current status.
|
|
||||||
*/
|
|
||||||
toggleEdit(): void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return true if current instance has an editor attached, and this editor is enabled.
|
|
||||||
*/
|
|
||||||
editEnabled(): boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Map {
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Options to pass to L.Editable when instanciating.
|
|
||||||
*/
|
|
||||||
editOptions: MapOptions;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* L.Editable plugin instance.
|
|
||||||
*/
|
|
||||||
editTools: Editable;
|
|
||||||
}
|
|
||||||
|
|
||||||
// tslint:disable-next-line:no-empty-interface
|
|
||||||
interface Polyline extends EditableMixin {}
|
|
||||||
|
|
||||||
namespace Map {
|
|
||||||
interface MapOptions {
|
|
||||||
/**
|
|
||||||
* Whether to create a L.Editable instance at map init or not.
|
|
||||||
*/
|
|
||||||
editable?: boolean;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Options to pass to L.Editable when instanciating.
|
|
||||||
*/
|
|
||||||
editOptions?: MapOptions;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When editing a feature (marker, polyline…), an editor is attached to it. This editor basically knows
|
|
||||||
* how to handle the edition.
|
|
||||||
*/
|
|
||||||
interface BaseEditor {
|
|
||||||
/**
|
|
||||||
* Set up the drawing tools for the feature to be editable.
|
|
||||||
*/
|
|
||||||
enable(): MarkerEditor|PolylineEditor|PolygonEditor;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove editing tools.
|
|
||||||
*/
|
|
||||||
disable(): MarkerEditor|PolylineEditor|PolygonEditor;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherit from L.Editable.BaseEditor.
|
|
||||||
* Inherited by L.Editable.PolylineEditor and L.Editable.PolygonEditor.
|
|
||||||
*/
|
|
||||||
interface PathEditor extends BaseEditor {
|
|
||||||
/**
|
|
||||||
* Rebuild edit elements (vertex, middlemarker, etc.).
|
|
||||||
*/
|
|
||||||
reset(): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherit from L.Editable.PathEditor.
|
|
||||||
*/
|
|
||||||
interface PolylineEditor extends PathEditor {
|
|
||||||
/**
|
|
||||||
* Set up drawing tools to continue the line forward.
|
|
||||||
*/
|
|
||||||
continueForward(): void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set up drawing tools to continue the line backward.
|
|
||||||
*/
|
|
||||||
continueBackward(): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherit from L.Editable.PathEditor.
|
|
||||||
*/
|
|
||||||
interface PolygonEditor extends PathEditor {
|
|
||||||
/**
|
|
||||||
* Set up drawing tools for creating a new hole on the polygon. If the latlng param is given, a first
|
|
||||||
* point is created.
|
|
||||||
*/
|
|
||||||
newHole(latlng: LatLng): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherit from L.Editable.BaseEditor.
|
|
||||||
*/
|
|
||||||
// tslint:disable-next-line:no-empty-interface
|
|
||||||
interface MarkerEditor extends BaseEditor {}
|
|
||||||
|
|
||||||
interface Marker extends EditableMixin, MarkerEditor {}
|
|
||||||
|
|
||||||
interface Polyline extends EditableMixin, PolylineEditor {}
|
|
||||||
|
|
||||||
interface Polygon extends EditableMixin, PolygonEditor {}
|
|
||||||
|
|
||||||
function map(element: string | HTMLElement, options?: EditOptions): Map;
|
|
||||||
}
|
|
||||||
@ -20,8 +20,7 @@
|
|||||||
"src/typings/jquery.flot.typings.d.ts",
|
"src/typings/jquery.flot.typings.d.ts",
|
||||||
"src/typings/jquery.jstree.typings.d.ts",
|
"src/typings/jquery.jstree.typings.d.ts",
|
||||||
"src/typings/split.js.typings.d.ts",
|
"src/typings/split.js.typings.d.ts",
|
||||||
"src/typings/add-marker.d.ts",
|
"src/typings/add-marker.d.ts"
|
||||||
"src/typings/leaflet-editable.d.ts"
|
|
||||||
],
|
],
|
||||||
"paths": {
|
"paths": {
|
||||||
"@app/*": ["src/app/*"],
|
"@app/*": ["src/app/*"],
|
||||||
|
|||||||
@ -1791,6 +1791,13 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@types/jquery" "*"
|
"@types/jquery" "*"
|
||||||
|
|
||||||
|
"@types/leaflet-editable@^1.2.1":
|
||||||
|
version "1.2.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/leaflet-editable/-/leaflet-editable-1.2.1.tgz#12f1bd1d9af7beafbac256216062e97fe2ee4d55"
|
||||||
|
integrity sha512-7Oms1HgulWiclkI0s1XLmr1yRylNoJX8sVUfAv9+28JzwWbKbLcQ6//vhFEOmoMlBQyL5veogKpUUb5qeF+Qyg==
|
||||||
|
dependencies:
|
||||||
|
"@types/leaflet" "*"
|
||||||
|
|
||||||
"@types/leaflet-polylinedecorator@^1.6.0":
|
"@types/leaflet-polylinedecorator@^1.6.0":
|
||||||
version "1.6.0"
|
version "1.6.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.0.tgz#1572131ffedb3154c6e18e682d2fb700e203af19"
|
resolved "https://registry.yarnpkg.com/@types/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.0.tgz#1572131ffedb3154c6e18e682d2fb700e203af19"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user