From 5a6d0672a1c21c392bad1e3a91f67167c529391f Mon Sep 17 00:00:00 2001 From: RiON69 Date: Mon, 6 Nov 2017 16:18:08 +0600 Subject: [PATCH 1/6] Add Leaflet.PolylineMeasure typings --- types/leaflet-polylinemeasure/index.d.ts | 42 +++++++++++++++++++ .../leaflet-polylinemeasure-tests.ts | 12 ++++++ types/leaflet-polylinemeasure/tsconfig.json | 23 ++++++++++ types/leaflet-polylinemeasure/tslint.json | 1 + 4 files changed, 78 insertions(+) create mode 100644 types/leaflet-polylinemeasure/index.d.ts create mode 100644 types/leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts create mode 100644 types/leaflet-polylinemeasure/tsconfig.json create mode 100644 types/leaflet-polylinemeasure/tslint.json diff --git a/types/leaflet-polylinemeasure/index.d.ts b/types/leaflet-polylinemeasure/index.d.ts new file mode 100644 index 0000000000..ec9e160702 --- /dev/null +++ b/types/leaflet-polylinemeasure/index.d.ts @@ -0,0 +1,42 @@ +// Type definitions for leaflet.polylinemeasure 1.0 +// Project: https://github.com/ppete2/Leaflet.PolylineMeasure#readme +// Definitions by: Rinat Sultanov +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +/// + +declare module L { + namespace Control { + + export interface PolylineMeasure extends L.Control { + new (options?: PolylineMeasureOptions): any; + } + + export interface PolylineMeasureOptions { + position?: string; + unit?: string; + measureControlTitleOn?: string; + measureControlTitleOff?: string; + measureControlLabel?: string; + measureControlClasses?: any[]; + backgroundColor?: string; + cursor?: string; + clearMeasurementsOnStop?: boolean; + showMeasurementsClearControl?: boolean; + clearControlTitle?: string; + clearControlLabel?: string; + clearControlClasses?: any[]; + showUnitControl?: boolean; + tempLine?: any; + fixedLine?: any; + startCircle?: any; + intermedCircle?: any; + currentCircle?: any; + endCircle?: any; + } + } + + export namespace control { + export function polylineMeasure (options?: Control.PolylineMeasureOptions): Control.PolylineMeasure; + } +} diff --git a/types/leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts b/types/leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts new file mode 100644 index 0000000000..4b3aeeb440 --- /dev/null +++ b/types/leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts @@ -0,0 +1,12 @@ +import * as L from 'leaflet'; +import 'leaflet.polylinemeasure'; + + +let map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom:15}); + +L.tileLayer("http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", { + subdomains:['a', 'b', 'c'], + attribution: '© OpenStreetMap' +}).addTo(map); + +L.control.polylineMeasure().addTo(map); diff --git a/types/leaflet-polylinemeasure/tsconfig.json b/types/leaflet-polylinemeasure/tsconfig.json new file mode 100644 index 0000000000..3eeed134d0 --- /dev/null +++ b/types/leaflet-polylinemeasure/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6", + "DOM" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "leaflet-polylinemeasure-tests.ts" + ] +} diff --git a/types/leaflet-polylinemeasure/tslint.json b/types/leaflet-polylinemeasure/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/leaflet-polylinemeasure/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From 614324fb3008badd181ccd369f4596f4206bed3c Mon Sep 17 00:00:00 2001 From: Rinat Sultanov Date: Mon, 6 Nov 2017 16:47:48 +0600 Subject: [PATCH 2/6] Rename package --- .../index.d.ts | 0 .../leaflet.polylinemeasure-tests.ts} | 0 .../tsconfig.json | 2 +- .../tslint.json | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename types/{leaflet-polylinemeasure => leaflet.polylinemeasure}/index.d.ts (100%) rename types/{leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts => leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts} (100%) rename types/{leaflet-polylinemeasure => leaflet.polylinemeasure}/tsconfig.json (91%) rename types/{leaflet-polylinemeasure => leaflet.polylinemeasure}/tslint.json (100%) diff --git a/types/leaflet-polylinemeasure/index.d.ts b/types/leaflet.polylinemeasure/index.d.ts similarity index 100% rename from types/leaflet-polylinemeasure/index.d.ts rename to types/leaflet.polylinemeasure/index.d.ts diff --git a/types/leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts similarity index 100% rename from types/leaflet-polylinemeasure/leaflet-polylinemeasure-tests.ts rename to types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts diff --git a/types/leaflet-polylinemeasure/tsconfig.json b/types/leaflet.polylinemeasure/tsconfig.json similarity index 91% rename from types/leaflet-polylinemeasure/tsconfig.json rename to types/leaflet.polylinemeasure/tsconfig.json index 3eeed134d0..3cd64bc0b0 100644 --- a/types/leaflet-polylinemeasure/tsconfig.json +++ b/types/leaflet.polylinemeasure/tsconfig.json @@ -18,6 +18,6 @@ }, "files": [ "index.d.ts", - "leaflet-polylinemeasure-tests.ts" + "leaflet.polylinemeasure-tests.ts" ] } diff --git a/types/leaflet-polylinemeasure/tslint.json b/types/leaflet.polylinemeasure/tslint.json similarity index 100% rename from types/leaflet-polylinemeasure/tslint.json rename to types/leaflet.polylinemeasure/tslint.json From 4df9c0213083f47cae36e810b517926ba168d080 Mon Sep 17 00:00:00 2001 From: Rinat Sultanov Date: Mon, 6 Nov 2017 17:06:38 +0600 Subject: [PATCH 3/6] Fix tests --- .../leaflet.polylinemeasure-tests.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts index 4b3aeeb440..6b39698186 100644 --- a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts +++ b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts @@ -1,8 +1,4 @@ -import * as L from 'leaflet'; -import 'leaflet.polylinemeasure'; - - -let map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom:15}); +const map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom:15}); L.tileLayer("http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", { subdomains:['a', 'b', 'c'], From c56b29eae6779928e8f0dc805163b18aa80e41c6 Mon Sep 17 00:00:00 2001 From: Rinat Sultanov Date: Mon, 6 Nov 2017 17:16:31 +0600 Subject: [PATCH 4/6] Fix strictFunctionTypes: false --- types/leaflet.polylinemeasure/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/types/leaflet.polylinemeasure/tsconfig.json b/types/leaflet.polylinemeasure/tsconfig.json index 3cd64bc0b0..b1db5e086d 100644 --- a/types/leaflet.polylinemeasure/tsconfig.json +++ b/types/leaflet.polylinemeasure/tsconfig.json @@ -8,6 +8,7 @@ "noImplicitAny": true, "noImplicitThis": true, "strictNullChecks": true, + "strictFunctionTypes": false, "baseUrl": "../", "typeRoots": [ "../" From 8e7f1b0f59e81f124a623b2e7d980f383f7b16ed Mon Sep 17 00:00:00 2001 From: Rinat Sultanov Date: Tue, 7 Nov 2017 08:22:27 +0600 Subject: [PATCH 5/6] Fix tests --- .../leaflet.polylinemeasure-tests.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts index 6b39698186..4b3aeeb440 100644 --- a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts +++ b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts @@ -1,4 +1,8 @@ -const map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom:15}); +import * as L from 'leaflet'; +import 'leaflet.polylinemeasure'; + + +let map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom:15}); L.tileLayer("http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", { subdomains:['a', 'b', 'c'], From 1f87a977efbd753b3723477312cc1a8e12b7993a Mon Sep 17 00:00:00 2001 From: Rinat Sultanov Date: Tue, 7 Nov 2017 09:43:35 +0600 Subject: [PATCH 6/6] Fixs index && tests --- types/leaflet.polylinemeasure/index.d.ts | 13 ++++++------- .../leaflet.polylinemeasure-tests.ts | 5 ++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/types/leaflet.polylinemeasure/index.d.ts b/types/leaflet.polylinemeasure/index.d.ts index ec9e160702..134b459ed1 100644 --- a/types/leaflet.polylinemeasure/index.d.ts +++ b/types/leaflet.polylinemeasure/index.d.ts @@ -3,16 +3,15 @@ // Definitions by: Rinat Sultanov // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -/// +import * as L from 'leaflet'; -declare module L { +declare module 'leaflet' { namespace Control { - - export interface PolylineMeasure extends L.Control { + interface PolylineMeasure extends Control { new (options?: PolylineMeasureOptions): any; } - export interface PolylineMeasureOptions { + interface PolylineMeasureOptions { position?: string; unit?: string; measureControlTitleOn?: string; @@ -36,7 +35,7 @@ declare module L { } } - export namespace control { - export function polylineMeasure (options?: Control.PolylineMeasureOptions): Control.PolylineMeasure; + namespace control { + function polylineMeasure(options?: Control.PolylineMeasureOptions): Control.PolylineMeasure; } } diff --git a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts index 4b3aeeb440..58a9f3ccb8 100644 --- a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts +++ b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts @@ -1,11 +1,10 @@ import * as L from 'leaflet'; import 'leaflet.polylinemeasure'; - -let map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom:15}); +const map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom: 15}); L.tileLayer("http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", { - subdomains:['a', 'b', 'c'], + subdomains: ['a', 'b', 'c'], attribution: '© OpenStreetMap' }).addTo(map);