@golemio/mvt-maps 1.1.2-dev.2031558969 → 1.1.2-dev.2085874835
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.
|
@@ -17,6 +17,7 @@ const ModuleContainerToken_1 = require("../ioc/ModuleContainerToken");
|
|
|
17
17
|
const FilterOperator_1 = require("../services/FilterOperator");
|
|
18
18
|
const MvtClusterService_1 = require("../services/MvtClusterService");
|
|
19
19
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
20
|
+
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
20
21
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
21
22
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
22
23
|
let V2MvtController = exports.V2MvtController = class V2MvtController {
|
|
@@ -25,8 +26,9 @@ let V2MvtController = exports.V2MvtController = class V2MvtController {
|
|
|
25
26
|
this.logger = logger;
|
|
26
27
|
this.getAll = async (req, res, next) => {
|
|
27
28
|
try {
|
|
29
|
+
const queryData = (0, express_validator_1.matchedData)(req);
|
|
28
30
|
const params = this.parseParams(req);
|
|
29
|
-
const filterParams =
|
|
31
|
+
const filterParams = queryData.filter ? this.parseFilterParams(queryData.filter) : undefined;
|
|
30
32
|
if (filterParams) {
|
|
31
33
|
this.validateFilterParams(filterParams);
|
|
32
34
|
}
|
|
@@ -51,19 +53,20 @@ let V2MvtController = exports.V2MvtController = class V2MvtController {
|
|
|
51
53
|
}
|
|
52
54
|
parseParams(req) {
|
|
53
55
|
try {
|
|
56
|
+
const queryData = (0, express_validator_1.matchedData)(req);
|
|
54
57
|
return {
|
|
55
58
|
x: parseInt(req.params.x),
|
|
56
59
|
y: parseInt(req.params.y),
|
|
57
60
|
z: parseInt(req.params.z),
|
|
58
|
-
table:
|
|
59
|
-
geometry:
|
|
60
|
-
attributes: Array.isArray(
|
|
61
|
-
?
|
|
62
|
-
: [
|
|
63
|
-
radius:
|
|
64
|
-
maxZoom: parseInt(
|
|
65
|
-
clusterPoint:
|
|
66
|
-
colorAttribute:
|
|
61
|
+
table: queryData.table,
|
|
62
|
+
geometry: queryData.geometry,
|
|
63
|
+
attributes: Array.isArray(queryData.attributes)
|
|
64
|
+
? queryData.attributes
|
|
65
|
+
: [queryData.attributes],
|
|
66
|
+
radius: queryData.radius ? parseInt(queryData.radius) : undefined,
|
|
67
|
+
maxZoom: parseInt(queryData.maxZoom),
|
|
68
|
+
clusterPoint: queryData.clusterPoint ? queryData.clusterPoint : undefined,
|
|
69
|
+
colorAttribute: queryData.colorAttribute ? queryData.colorAttribute : undefined,
|
|
67
70
|
};
|
|
68
71
|
}
|
|
69
72
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2MvtController.js","sourceRoot":"","sources":["../../../src/output-gateway/controllers/V2MvtController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAoE;AAEpE,+DAA6D;AAG7D,qEAAmE;AACnE,wEAAqE;AAGrE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,eAAe,6BAArB,MAAM,eAAe;IACxB,YACoD,OAAkC,EACxD,MAAuB;QADO,YAAO,GAAP,OAAO,CAAmB;QAChD,WAAM,GAAN,MAAM,CAAS;QAG9C,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACrC,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"V2MvtController.js","sourceRoot":"","sources":["../../../src/output-gateway/controllers/V2MvtController.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/mvt-maps",
|
|
3
|
-
"version": "1.1.2-dev.
|
|
3
|
+
"version": "1.1.2-dev.2085874835",
|
|
4
4
|
"description": "Golemio MVT Maps Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@commitlint/cli": "^19.3.0",
|
|
36
36
|
"@commitlint/config-conventional": "^11.0.0",
|
|
37
37
|
"@golemio/cli": "1.11.0",
|
|
38
|
-
"@golemio/core": "1.22.
|
|
38
|
+
"@golemio/core": "1.22.2-dev.2083548346",
|
|
39
39
|
"@golemio/db-common": "1.2.0",
|
|
40
40
|
"@golemio/eslint-config": "1.1.2",
|
|
41
41
|
"@types/chai": "4.2.3",
|