@itwin/map-layers-formats 3.5.0-dev.52 → 3.5.0-dev.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.rush/temp/operation/build_ci/state.json +1 -1
- package/.rush/temp/operation/docs/state.json +1 -1
- package/.rush/temp/package-deps_build_ci.json +7 -7
- package/.rush/temp/package-deps_docs.json +7 -7
- package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.d.ts.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.js +39 -17
- package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.js.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeatureQuery.d.ts +0 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeatureQuery.d.ts.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeatureQuery.js +19 -27
- package/lib/cjs/ArcGisFeature/ArcGisFeatureQuery.js.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisSymbologyRenderer.d.ts.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisSymbologyRenderer.js +14 -11
- package/lib/cjs/ArcGisFeature/ArcGisSymbologyRenderer.js.map +1 -1
- package/lib/cjs/test/ArcGisFeature/ArcGisFeatureProvider.test.js +34 -10
- package/lib/cjs/test/ArcGisFeature/ArcGisFeatureProvider.test.js.map +1 -1
- package/lib/cjs/test/ArcGisFeature/ArcGisFeatureQuery.test.js +4 -9
- package/lib/cjs/test/ArcGisFeature/ArcGisFeatureQuery.test.js.map +1 -1
- package/lib/cjs/test/ArcGisFeature/ArcGisSymbologyRenderer.test.js +5 -5
- package/lib/cjs/test/ArcGisFeature/ArcGisSymbologyRenderer.test.js.map +1 -1
- package/lib/cjs/test/coverage/.nyc_output/{6d78e0cc-3049-49f9-9f29-97f2d2ce6c64.json → 40575325-e7ef-4a2f-b122-96c4919282f9.json} +0 -0
- package/lib/cjs/test/coverage/.nyc_output/94c48ef9-6b3d-4238-8893-892fa0244386.json +1 -0
- package/lib/cjs/test/coverage/.nyc_output/processinfo/40575325-e7ef-4a2f-b122-96c4919282f9.json +1 -0
- package/lib/cjs/test/coverage/.nyc_output/processinfo/94c48ef9-6b3d-4238-8893-892fa0244386.json +1 -0
- package/lib/cjs/test/coverage/.nyc_output/processinfo/index.json +1 -1
- package/lib/cjs/test/coverage/cobertura-coverage.xml +390 -387
- package/lib/cjs/test/coverage/lcov-report/index.html +18 -18
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureFormat.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureJSON.ts.html +5 -5
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeaturePBF.ts.html +9 -9
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureProvider.ts.html +146 -74
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureQuery.ts.html +32 -62
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureReader.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureRenderer.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureResponse.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisSymbologyRenderer.ts.html +64 -55
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/index.html +29 -29
- package/lib/cjs/test/coverage/lcov-report/src/index.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/map-layers-formats.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/mapLayersFormats.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov.info +637 -612
- package/lib/cjs/tsconfig.tsbuildinfo +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.d.ts.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js +41 -19
- package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.d.ts +0 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.d.ts.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.js +19 -27
- package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.js.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisSymbologyRenderer.d.ts.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisSymbologyRenderer.js +14 -11
- package/lib/esm/ArcGisFeature/ArcGisSymbologyRenderer.js.map +1 -1
- package/lib/esm/test/ArcGisFeature/ArcGisFeatureProvider.test.js +34 -10
- package/lib/esm/test/ArcGisFeature/ArcGisFeatureProvider.test.js.map +1 -1
- package/lib/esm/test/ArcGisFeature/ArcGisFeatureQuery.test.js +4 -9
- package/lib/esm/test/ArcGisFeature/ArcGisFeatureQuery.test.js.map +1 -1
- package/lib/esm/test/ArcGisFeature/ArcGisSymbologyRenderer.test.js +6 -6
- package/lib/esm/test/ArcGisFeature/ArcGisSymbologyRenderer.test.js.map +1 -1
- package/lib/esm/tsconfig.tsbuildinfo +1 -1
- package/lib/test/junit_results.xml +44 -46
- package/map-layers-formats.build.log +2 -2
- package/package.json +12 -12
- package/src/ArcGisFeature/ArcGisFeatureProvider.ts +39 -15
- package/src/ArcGisFeature/ArcGisFeatureQuery.ts +20 -30
- package/src/ArcGisFeature/ArcGisSymbologyRenderer.ts +15 -12
- package/src/test/ArcGisFeature/ArcGisFeatureProvider.test.ts +39 -10
- package/src/test/ArcGisFeature/ArcGisFeatureQuery.test.ts +4 -11
- package/src/test/ArcGisFeature/ArcGisSymbologyRenderer.test.ts +5 -5
- package/lib/cjs/test/coverage/.nyc_output/5f6e61f1-8da3-4cce-bc95-ee236ec2bb5b.json +0 -1
- package/lib/cjs/test/coverage/.nyc_output/processinfo/5f6e61f1-8da3-4cce-bc95-ee236ec2bb5b.json +0 -1
- package/lib/cjs/test/coverage/.nyc_output/processinfo/6d78e0cc-3049-49f9-9f29-97f2d2ce6c64.json +0 -1
|
@@ -25,7 +25,7 @@ describe("ArcGisFeatureQuery", () => {
|
|
|
25
25
|
expect(queryUrl).to.not.contains("geometry");
|
|
26
26
|
expect(queryUrl).to.not.contains("inSR");
|
|
27
27
|
expect(queryUrl).to.not.contains("inSR");
|
|
28
|
-
expect(queryUrl).to.contains("where=1
|
|
28
|
+
expect(queryUrl).to.contains("where=1%3D1");
|
|
29
29
|
});
|
|
30
30
|
it("should not apply different switches if not needed", async () => {
|
|
31
31
|
const extentSize = 100;
|
|
@@ -66,10 +66,11 @@ describe("ArcGisFeatureQuery", () => {
|
|
|
66
66
|
expect(queryUrl).to.contains("maxRecordCountFactor=1000");
|
|
67
67
|
expect(queryUrl).to.contains("returnExceededLimitFeatures=false");
|
|
68
68
|
expect(queryUrl).to.contains("geometryType=esriGeometryEnvelope");
|
|
69
|
-
expect(queryUrl).to.contains(`geometry
|
|
69
|
+
expect(queryUrl).to.contains(`geometry=%7B%22xmin%22%3A0%2C%22ymin%22%3A0%2C%22xmax%22%3A100%2C%22ymax%22%3A100%2C%22spatialReference%22%3A%7B%22wkid%22%3A102100%2C%22latestWkid%22%3A3857%7D%7D`);
|
|
70
70
|
expect(queryUrl).to.contains("inSR=102100");
|
|
71
71
|
expect(queryUrl).to.contains("outFields=test");
|
|
72
72
|
expect(queryUrl).to.contains("distance=100");
|
|
73
|
+
expect(queryUrl).to.contains("units=esriSRUnit_Meter");
|
|
73
74
|
});
|
|
74
75
|
it("should not include geometry only when applicable", async () => {
|
|
75
76
|
const extentSize = 100;
|
|
@@ -94,14 +95,8 @@ describe("ArcGisFeatureQuery", () => {
|
|
|
94
95
|
query.geometry = { type: "esriGeometryEnvelope", geom: fakeEnvelope };
|
|
95
96
|
queryUrl = query.toString();
|
|
96
97
|
expect(queryUrl).to.contains("geometryType=esriGeometryEnvelope");
|
|
97
|
-
expect(queryUrl).to.contains(`geometry
|
|
98
|
+
expect(queryUrl).to.contains(`geometry=%7B%22xmin%22%3A0%2C%22ymin%22%3A0%2C%22xmax%22%3A100%2C%22ymax%22%3A100%2C%22spatialReference%22%3A%7B%22wkid%22%3A102100%2C%22latestWkid%22%3A3857%7D%7D`);
|
|
98
99
|
expect(queryUrl).to.contains("inSR=102100");
|
|
99
100
|
});
|
|
100
|
-
it("should not include empty param", async () => {
|
|
101
|
-
const url = "https://test.com/rest/";
|
|
102
|
-
const clonedUrl = url.slice();
|
|
103
|
-
ArcGisFeatureQuery.appendParam(clonedUrl, "", "value");
|
|
104
|
-
expect(url).to.equals(clonedUrl);
|
|
105
|
-
});
|
|
106
101
|
});
|
|
107
102
|
//# sourceMappingURL=ArcGisFeatureQuery.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArcGisFeatureQuery.test.js","sourceRoot":"","sources":["../../../../src/test/ArcGisFeature/ArcGisFeatureQuery.test.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAgB,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE1F,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAElC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;IAEtC,UAAU,CAAC,KAAK,IAAI,EAAE;IACtB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QAEjE,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,wBAAwB,EAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACtD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACnD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAChE,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"ArcGisFeatureQuery.test.js","sourceRoot":"","sources":["../../../../src/test/ArcGisFeature/ArcGisFeatureQuery.test.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { expect } from \"chai\";\r\nimport * as sinon from \"sinon\";\r\nimport { ArcGisExtent, ArcGisFeatureQuery } from \"../../ArcGisFeature/ArcGisFeatureQuery\";\r\n\r\ndescribe(\"ArcGisFeatureQuery\", () => {\r\n\r\n const sandbox = sinon.createSandbox();\r\n\r\n beforeEach(async () => {\r\n });\r\n\r\n afterEach(async () => {\r\n sandbox.restore();\r\n });\r\n\r\n it(\"should not apply different switches if not needed\", async () => {\r\n\r\n const query = new ArcGisFeatureQuery(\"https://test.com/rest/\",0, \"JSON\", 3857);\r\n const queryUrl = query.toString();\r\n expect(queryUrl).to.not.contains(\"resultRecordCount\");\r\n expect(queryUrl).to.not.contains(\"resultOffset\");\r\n expect(queryUrl).to.not.contains(\"returnGeometry\");\r\n expect(queryUrl).to.not.contains(\"resultType\");\r\n expect(queryUrl).to.not.contains(\"maxRecordCountFactor\");\r\n expect(queryUrl).to.not.contains(\"returnExceededLimitFeatures\");\r\n expect(queryUrl).to.not.contains(\"geometryType\");\r\n expect(queryUrl).to.not.contains(\"geometry\");\r\n expect(queryUrl).to.not.contains(\"inSR\");\r\n expect(queryUrl).to.not.contains(\"inSR\");\r\n expect(queryUrl).to.contains(\"where=1%3D1\");\r\n });\r\n\r\n it(\"should not apply different switches if not needed\", async () => {\r\n\r\n const extentSize = 100;\r\n const fakeEnvelope: ArcGisExtent = {\r\n xmin : 0,\r\n ymin : 0,\r\n xmax : extentSize,\r\n ymax : extentSize,\r\n spatialReference : {\r\n wkid : 102100,\r\n latestWkid : 3857,\r\n }};\r\n const query = new ArcGisFeatureQuery(\"https://test.com/rest/\",0, \"JSON\", 3857,\r\n {\r\n resultRecordCount: 10,\r\n resultOffset: 11,\r\n returnGeometry: true,\r\n geometry: {type:\"esriGeometryEnvelope\", geom:fakeEnvelope},\r\n geometryType: \"esriGeometryEnvelope\",\r\n spatialRel: \"esriSpatialRelIntersects\",\r\n resultType: \"tile\",\r\n maxRecordCountFactor: 1000,\r\n returnExceededLimitFeatures: false,\r\n quantizationParameters: {\r\n mode: \"view\",\r\n originPosition: \"upperLeft\",\r\n tolerance: 10,\r\n extent: fakeEnvelope,\r\n },\r\n outFields: \"test\",\r\n distance: 100,\r\n });\r\n const queryUrl = query.toString();\r\n expect(queryUrl).to.contains(\"resultRecordCount=10\");\r\n expect(queryUrl).to.contains(\"resultOffset=11\");\r\n expect(queryUrl).to.contains(\"returnGeometry=true\");\r\n expect(queryUrl).to.contains(`resultType=tile`);\r\n expect(queryUrl).to.contains(\"maxRecordCountFactor=1000\");\r\n expect(queryUrl).to.contains(\"returnExceededLimitFeatures=false\");\r\n expect(queryUrl).to.contains(\"geometryType=esriGeometryEnvelope\");\r\n expect(queryUrl).to.contains(`geometry=%7B%22xmin%22%3A0%2C%22ymin%22%3A0%2C%22xmax%22%3A100%2C%22ymax%22%3A100%2C%22spatialReference%22%3A%7B%22wkid%22%3A102100%2C%22latestWkid%22%3A3857%7D%7D`);\r\n expect(queryUrl).to.contains(\"inSR=102100\");\r\n expect(queryUrl).to.contains(\"outFields=test\");\r\n expect(queryUrl).to.contains(\"distance=100\");\r\n expect(queryUrl).to.contains(\"units=esriSRUnit_Meter\");\r\n\r\n });\r\n\r\n it(\"should not include geometry only when applicable\", async () => {\r\n\r\n const extentSize = 100;\r\n const fakeEnvelope: ArcGisExtent = {\r\n xmin : 0,\r\n ymin : 0,\r\n xmax : extentSize,\r\n ymax : extentSize,\r\n spatialReference : {\r\n wkid : 102100,\r\n latestWkid : 3857,\r\n }};\r\n const query = new ArcGisFeatureQuery(\"https://test.com/rest/\",0, \"JSON\", 3857,\r\n {\r\n spatialRel: \"esriSpatialRelIntersects\",\r\n });\r\n\r\n let queryUrl = query.toString();\r\n expect(queryUrl).to.not.contains(\"geometryType=\");\r\n expect(queryUrl).to.not.contains(`geometry=`);\r\n expect(queryUrl).to.not.contains(\"inSR=\");\r\n\r\n query.spatialRel = undefined;\r\n query.geometry = {type:\"esriGeometryEnvelope\", geom:fakeEnvelope};\r\n queryUrl = query.toString();\r\n expect(queryUrl).to.contains(\"geometryType=esriGeometryEnvelope\");\r\n expect(queryUrl).to.contains(`geometry=%7B%22xmin%22%3A0%2C%22ymin%22%3A0%2C%22xmax%22%3A100%2C%22ymax%22%3A100%2C%22spatialReference%22%3A%7B%22wkid%22%3A102100%2C%22latestWkid%22%3A3857%7D%7D`);\r\n expect(queryUrl).to.contains(\"inSR=102100\");\r\n\r\n });\r\n\r\n});\r\n"]}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { expect } from "chai";
|
|
6
6
|
import * as sinon from "sinon";
|
|
7
7
|
import { NewYorkDataset } from "./NewYorkDataset";
|
|
8
|
-
import { ArcGisSymbologyRenderer } from "../../ArcGisFeature/ArcGisSymbologyRenderer";
|
|
8
|
+
import { ArcGisSymbologyRenderer, EsriPMS, EsriSFS, EsriSLS } from "../../ArcGisFeature/ArcGisSymbologyRenderer";
|
|
9
9
|
import { PhillyLandmarksDataset } from "./PhillyLandmarksDataset";
|
|
10
10
|
describe("ArcGisSymbologyRenderer", () => {
|
|
11
11
|
const sandbox = sinon.createSandbox();
|
|
@@ -32,15 +32,15 @@ describe("ArcGisSymbologyRenderer", () => {
|
|
|
32
32
|
};
|
|
33
33
|
it("should construct renderer from incomplete drawing info", async () => {
|
|
34
34
|
let provider = new ArcGisSymbologyRenderer("esriGeometryPoint", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);
|
|
35
|
-
comparePointSymbol(provider._symbol, ArcGisSymbologyRenderer.defaultPMS);
|
|
35
|
+
comparePointSymbol(provider._symbol, EsriPMS.fromJSON(ArcGisSymbologyRenderer.defaultPMS));
|
|
36
36
|
provider = new ArcGisSymbologyRenderer("esriGeometryMultipoint", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);
|
|
37
|
-
comparePointSymbol(provider._symbol, ArcGisSymbologyRenderer.defaultPMS);
|
|
37
|
+
comparePointSymbol(provider._symbol, EsriPMS.fromJSON(ArcGisSymbologyRenderer.defaultPMS));
|
|
38
38
|
provider = new ArcGisSymbologyRenderer("esriGeometryPolyline", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);
|
|
39
|
-
compareLineSymbol(provider._symbol, ArcGisSymbologyRenderer.defaultSLS);
|
|
39
|
+
compareLineSymbol(provider._symbol, EsriSLS.fromJSON(ArcGisSymbologyRenderer.defaultSLS));
|
|
40
40
|
provider = new ArcGisSymbologyRenderer("esriGeometryLine", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);
|
|
41
|
-
compareLineSymbol(provider._symbol, ArcGisSymbologyRenderer.defaultSLS);
|
|
41
|
+
compareLineSymbol(provider._symbol, EsriSLS.fromJSON(ArcGisSymbologyRenderer.defaultSLS));
|
|
42
42
|
provider = new ArcGisSymbologyRenderer("esriGeometryPolygon", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);
|
|
43
|
-
comparePolySymbol(provider._symbol, ArcGisSymbologyRenderer.defaultSFS);
|
|
43
|
+
comparePolySymbol(provider._symbol, EsriSFS.fromJSON(ArcGisSymbologyRenderer.defaultSFS));
|
|
44
44
|
});
|
|
45
45
|
it("should construct renderer from unique value drawing info", async () => {
|
|
46
46
|
const provider = new ArcGisSymbologyRenderer("esriGeometryPoint", NewYorkDataset.uniqueValueDrawingInfo.drawingInfo.renderer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArcGisSymbologyRenderer.test.js","sourceRoot":"","sources":["../../../../src/test/ArcGisFeature/ArcGisSymbologyRenderer.test.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"ArcGisSymbologyRenderer.test.js","sourceRoot":"","sources":["../../../../src/test/ArcGisFeature/ArcGisSymbologyRenderer.test.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { expect } from \"chai\";\r\nimport * as sinon from \"sinon\";\r\nimport { NewYorkDataset } from \"./NewYorkDataset\";\r\nimport { ArcGisSymbologyRenderer, EsriPMS, EsriSFS, EsriSLS } from \"../../ArcGisFeature/ArcGisSymbologyRenderer\";\r\nimport { PhillyLandmarksDataset } from \"./PhillyLandmarksDataset\";\r\n\r\ndescribe(\"ArcGisSymbologyRenderer\", () => {\r\n\r\n const sandbox = sinon.createSandbox();\r\n\r\n afterEach(async () => {\r\n sandbox.restore();\r\n });\r\n\r\n const comparePointSymbol = (symbol1: EsriPMS, symbol2: EsriPMS ) => {\r\n expect(symbol1.type).to.equals(symbol2.type);\r\n expect(symbol1.contentType).to.equals(symbol2.contentType);\r\n expect(symbol1.height).to.equals(symbol2.height);\r\n expect(symbol1.width).to.equals(symbol2.width);\r\n expect(symbol1.imageData).to.equals(symbol2.imageData);\r\n };\r\n\r\n const compareLineSymbol = (symbol1: EsriSLS, symbol2: EsriSLS ) => {\r\n expect(symbol1.type).to.equals(symbol2.type);\r\n expect(symbol1.color).to.equals(symbol2.color);\r\n expect(symbol1.width).to.equals(symbol2.width);\r\n expect(symbol1.style).to.equals(symbol2.style);\r\n };\r\n\r\n const comparePolySymbol = (symbol1: EsriSLS, symbol2: EsriSFS ) => {\r\n expect(symbol1.type).to.equals(symbol2.type);\r\n expect(symbol1.color).to.equals(symbol2.color);\r\n expect(symbol1.style).to.equals(symbol2.style);\r\n };\r\n\r\n it(\"should construct renderer from incomplete drawing info\", async () => {\r\n let provider = new ArcGisSymbologyRenderer(\"esriGeometryPoint\", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);\r\n comparePointSymbol((provider as any)._symbol, EsriPMS.fromJSON((ArcGisSymbologyRenderer as any).defaultPMS));\r\n\r\n provider = new ArcGisSymbologyRenderer(\"esriGeometryMultipoint\", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);\r\n comparePointSymbol((provider as any)._symbol, EsriPMS.fromJSON((ArcGisSymbologyRenderer as any).defaultPMS));\r\n\r\n provider = new ArcGisSymbologyRenderer(\"esriGeometryPolyline\", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);\r\n compareLineSymbol((provider as any)._symbol, EsriSLS.fromJSON((ArcGisSymbologyRenderer as any).defaultSLS));\r\n\r\n provider = new ArcGisSymbologyRenderer(\"esriGeometryLine\", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);\r\n compareLineSymbol((provider as any)._symbol, EsriSLS.fromJSON((ArcGisSymbologyRenderer as any).defaultSLS));\r\n\r\n provider = new ArcGisSymbologyRenderer(\"esriGeometryPolygon\", NewYorkDataset.incompleteDrawingInfo.drawingInfo.renderer);\r\n comparePolySymbol((provider as any)._symbol, EsriSFS.fromJSON((ArcGisSymbologyRenderer as any).defaultSFS));\r\n\r\n });\r\n\r\n it(\"should construct renderer from unique value drawing info\", async () => {\r\n const provider = new ArcGisSymbologyRenderer(\"esriGeometryPoint\", NewYorkDataset.uniqueValueDrawingInfo.drawingInfo.renderer);\r\n comparePointSymbol((provider as any)._symbol, NewYorkDataset.uniqueValueDrawingInfo.drawingInfo.renderer.defaultSymbol as any);\r\n\r\n });\r\n\r\n it(\"should construct renderer from point symbology drawing info\", async () => {\r\n\r\n let provider = new ArcGisSymbologyRenderer(\"esriGeometryPoint\", PhillyLandmarksDataset.pointDrawingInfo.drawingInfo.renderer);\r\n comparePointSymbol((provider as any)._symbol, PhillyLandmarksDataset.pointDrawingInfo.drawingInfo.renderer.symbol as any);\r\n\r\n provider = new ArcGisSymbologyRenderer(\"esriGeometryPolyline\", PhillyLandmarksDataset.lineDrawingInfo.drawingInfo.renderer);\r\n comparePointSymbol((provider as any)._symbol, PhillyLandmarksDataset.lineDrawingInfo.drawingInfo.renderer.symbol as any);\r\n\r\n provider = new ArcGisSymbologyRenderer(\"esriGeometryPolygon\", PhillyLandmarksDataset.polygonDrawingInfo.drawingInfo.renderer);\r\n comparePointSymbol((provider as any)._symbol, PhillyLandmarksDataset.polygonDrawingInfo.drawingInfo.renderer.symbol as any);\r\n\r\n });\r\n\r\n});\r\n"]}
|