From 0eb683f995b9053d8de3eee807c256b1b2239534 Mon Sep 17 00:00:00 2001 From: strajuser Date: Tue, 15 Aug 2017 13:11:17 +0300 Subject: [PATCH 1/6] Default export fix --- types/esri-leaflet/esri-leaflet-tests.ts | 2 -- types/esri-leaflet/index.d.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/types/esri-leaflet/esri-leaflet-tests.ts b/types/esri-leaflet/esri-leaflet-tests.ts index 7198c06d06..395560136f 100644 --- a/types/esri-leaflet/esri-leaflet-tests.ts +++ b/types/esri-leaflet/esri-leaflet-tests.ts @@ -4,8 +4,6 @@ // tslint:disable:only-arrow-functions // tslint:disable:space-before-function-paren -import L = require('esri-leaflet'); - let latlng: L.LatLng = new L.LatLng(0, 0); let latlngbounds: L.LatLngBounds = new L.LatLngBounds(latlng, latlng); let map: L.Map = new L.Map('map'); diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts index e2ccf9f6a8..d0b8f5b62d 100644 --- a/types/esri-leaflet/index.d.ts +++ b/types/esri-leaflet/index.d.ts @@ -1600,5 +1600,5 @@ declare namespace L { } declare module 'esri-leaflet' { - export = L; + export = L.esri; } From 07b38388cb063a2e3628e7452b3550a1f673d647 Mon Sep 17 00:00:00 2001 From: strajuser Date: Tue, 15 Aug 2017 14:16:33 +0300 Subject: [PATCH 2/6] - update to 2.1 api --- types/esri-leaflet/esri-leaflet-tests.ts | 20 ++++++++++++ types/esri-leaflet/index.d.ts | 40 +++++++++++++++++++++--- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/types/esri-leaflet/esri-leaflet-tests.ts b/types/esri-leaflet/esri-leaflet-tests.ts index 395560136f..2c0d948aba 100644 --- a/types/esri-leaflet/esri-leaflet-tests.ts +++ b/types/esri-leaflet/esri-leaflet-tests.ts @@ -8,6 +8,11 @@ let latlng: L.LatLng = new L.LatLng(0, 0); let latlngbounds: L.LatLngBounds = new L.LatLngBounds(latlng, latlng); let map: L.Map = new L.Map('map'); +let marker: L.Marker = new L.Marker(latlng); +let polygon: L.Polygon = new L.Polygon([latlng, latlng]); +let polyline: L.Polyline = new L.Polyline([latlng, latlng]); +let geojson: L.GeoJSON = new L.GeoJSON(); + let basemapLayer: L.esri.BasemapLayer; basemapLayer = L.esri.basemapLayer('Streets'); basemapLayer = L.esri.basemapLayer('Topographic'); @@ -128,6 +133,7 @@ dynamicMapLayerOptions = { position: 'front', maxZoom: 1, minZoom: 1, + disableCache: true, dynamicLayers: [{ id: 501, source: { @@ -162,6 +168,7 @@ dynamicMapLayer = L.esri.dynamicMapLayer({ position: 'front', maxZoom: 1, minZoom: 1, + disableCache: true, dynamicLayers: [{ id: 501, source: { @@ -196,6 +203,7 @@ dynamicMapLayer = new L.esri.DynamicMapLayer({ position: 'front', maxZoom: 1, minZoom: 1, + disableCache: true, dynamicLayers: [{ id: 501, source: { @@ -523,6 +531,12 @@ query.ids(function (error, ids, response) { }); query.where("zone_id='B'").bounds(function (error, latLngBounds, response) { }); +query.transform(15851); +query.transform({"wkid" : 15851 }); +query.transform({"wkt" : "GEOGTRAN[\..."}); + +query.format(false); + let identifyFeaturesOptions: L.esri.IdentifyFeaturesOptions; let identifyFeatures: L.esri.IdentifyFeatures; @@ -559,6 +573,12 @@ identifyFeatures .layers('visible:1') .run(function (error, featureCollection, response) { }); +identifyFeatures.at(marker); +identifyFeatures.at(polygon); +identifyFeatures.at(polyline); +identifyFeatures.at(latlngbounds); +identifyFeatures.at(geojson); + let findOptions: L.esri.FindOptions; let find: L.esri.Find; diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts index d0b8f5b62d..7b4687e592 100644 --- a/types/esri-leaflet/index.d.ts +++ b/types/esri-leaflet/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for esri-leaflet 2.0 +// Type definitions for esri-leaflet 2.1.1 // Project: http://esri.github.io/esri-leaflet // Definitions by: strajuser // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -66,9 +66,15 @@ declare namespace L { | 'ShadedReliefLabels' | 'TerrainLabels'; - type LeafletGeometry = L.Marker | L.Polygon | L.Polyline | L.LatLng | L.LatLngBounds | L.GeoJSON; + type LeafletGeometry = L.Marker | L.Polygon | L.Polyline | L.LatLngExpression | L.LatLngBounds | L.GeoJSON; type GeoJSONGeometry = GeoJSON.Point | GeoJSON.Polygon | GeoJSON.LineString; type Geometry = LeafletGeometry | GeoJSONGeometry; + type SpatialReferenceExpression = number | SpatialReference; + + interface SpatialReference { + wkid?: number; + wkt?: string; + } /** * Options for L.esri.BasemapLayer @@ -346,6 +352,13 @@ declare namespace L { * @memberof DynamicMapLayerOptions */ dynamicLayers?: any; + /** + * If enabled, appends a timestamp to each request to ensure a fresh image is created server-side. + * + * @type {boolean} + * @memberof DynamicMapLayerOptions + */ + disableCache?: boolean; } /** @@ -1002,6 +1015,15 @@ declare namespace L { * @memberof Task */ token(token: string): this; + + /** + * + * + * @param {boolean} returnUnformattedValues + * @returns {this} + * @memberof Task + */ + format(returnUnformattedValues: boolean): this; } /** @@ -1334,6 +1356,14 @@ declare namespace L { * @memberof Query */ bounds(callback: FeatureCallbackHandler, context?: any): this; + /** + * The WKID of a datum transformation for the server to apply when reprojecting output features. + * + * @param {SpatialReferenceExpression} datumTranformation + * @returns {this} + * @memberof Query + */ + transform(datumTranformation: SpatialReferenceExpression): this; } /** @@ -1370,13 +1400,13 @@ declare namespace L { */ on(map: L.Map): this; /** - * Identifies feautres at a given + * Identifies features at a given LatLng geometry can also be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLngBounds, L.GeoJSON or a valid GeoJSON object literal. * - * @param {LatLngExpression} latlng + * @param {Geometry} geometry * @returns {this} * @memberof IdentifyFeatures */ - at(latlng: LatLngExpression): this; + at(geometry: Geometry): this; /** * Add a layer definition to the query. * From 321c3af85706a9f6421c0d3007b2f234101dc8e0 Mon Sep 17 00:00:00 2001 From: strajuser Date: Tue, 15 Aug 2017 14:49:17 +0300 Subject: [PATCH 3/6] -esri-leaflet-geocoder test file fix --- types/esri-leaflet-geocoder/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/esri-leaflet-geocoder/index.d.ts b/types/esri-leaflet-geocoder/index.d.ts index 762af94558..59040f5458 100644 --- a/types/esri-leaflet-geocoder/index.d.ts +++ b/types/esri-leaflet-geocoder/index.d.ts @@ -5,7 +5,7 @@ // TypeScript Version: 2.4 import * as leaflet from 'leaflet'; -import { esri as esriLeaflet } from 'esri-leaflet'; +import * as esriLeaflet from 'esri-leaflet'; export = L; From a5ba76e86464d6712da48fd6fa89de573d1fbe98 Mon Sep 17 00:00:00 2001 From: strajuser Date: Tue, 15 Aug 2017 14:49:49 +0300 Subject: [PATCH 4/6] lint fixes --- types/esri-leaflet/esri-leaflet-tests.ts | 4 ++-- types/esri-leaflet/index.d.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/types/esri-leaflet/esri-leaflet-tests.ts b/types/esri-leaflet/esri-leaflet-tests.ts index 2c0d948aba..a4fcebcb5a 100644 --- a/types/esri-leaflet/esri-leaflet-tests.ts +++ b/types/esri-leaflet/esri-leaflet-tests.ts @@ -532,8 +532,8 @@ query.ids(function (error, ids, response) { }); query.where("zone_id='B'").bounds(function (error, latLngBounds, response) { }); query.transform(15851); -query.transform({"wkid" : 15851 }); -query.transform({"wkt" : "GEOGTRAN[\..."}); +query.transform({wkid: 15851 }); +query.transform({wkt: "GEOGTRAN[\..."}); query.format(false); diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts index 7b4687e592..173e856e98 100644 --- a/types/esri-leaflet/index.d.ts +++ b/types/esri-leaflet/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for esri-leaflet 2.1.1 +// Type definitions for esri-leaflet 2.1 // Project: http://esri.github.io/esri-leaflet // Definitions by: strajuser // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped From 4b58b14b4478142ef3a273be813eaffa513c2ba2 Mon Sep 17 00:00:00 2001 From: strajuser Date: Fri, 18 Aug 2017 13:02:26 +0300 Subject: [PATCH 5/6] - no-trailing-whitespace fixes --- types/esri-leaflet/index.d.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts index bb0163f80e..ed952652b2 100644 --- a/types/esri-leaflet/index.d.ts +++ b/types/esri-leaflet/index.d.ts @@ -347,7 +347,7 @@ declare namespace L { dynamicLayers?: any; /** * If enabled, appends a timestamp to each request to ensure a fresh image is created server-side. - * + * * @type {boolean} * @memberof DynamicMapLayerOptions */ @@ -1010,10 +1010,10 @@ declare namespace L { token(token: string): this; /** + * * - * - * @param {boolean} returnUnformattedValues - * @returns {this} + * @param {boolean} returnUnformattedValues + * @returns {this} * @memberof Task */ format(returnUnformattedValues: boolean): this; @@ -1185,7 +1185,7 @@ declare namespace L { */ intersects(geometry: Geometry): this; /** - * Queries features from the service that have a bounding box that intersects the bounding box of the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon. + * Queries features from the service that have a bounding box that intersects the bounding box of the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon. * * @param {Geometry} geometry * @returns {this} @@ -1351,9 +1351,9 @@ declare namespace L { bounds(callback: FeatureCallbackHandler, context?: any): this; /** * The WKID of a datum transformation for the server to apply when reprojecting output features. - * + * * @param {SpatialReferenceExpression} datumTranformation - * @returns {this} + * @returns {this} * @memberof Query */ transform(datumTranformation: SpatialReferenceExpression): this; @@ -1394,9 +1394,9 @@ declare namespace L { on(map: L.Map): this; /** * Identifies features at a given LatLng geometry can also be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLngBounds, L.GeoJSON or a valid GeoJSON object literal. - * - * @param {Geometry} geometry - * @returns {this} + * + * @param {Geometry} geometry + * @returns {this} * @memberof IdentifyFeatures */ at(geometry: Geometry): this; From b64e1c76126e3819a390b9712a983b624fe12af2 Mon Sep 17 00:00:00 2001 From: strajuser Date: Fri, 18 Aug 2017 14:13:18 +0300 Subject: [PATCH 6/6] - no-trailing-whitespace fix 2 --- types/esri-leaflet/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts index ed952652b2..a79322983e 100644 --- a/types/esri-leaflet/index.d.ts +++ b/types/esri-leaflet/index.d.ts @@ -1011,7 +1011,7 @@ declare namespace L { /** * - * + * * @param {boolean} returnUnformattedValues * @returns {this} * @memberof Task