Skip to content
Snippets Groups Projects
Commit 58e4ca84 authored by Glenn Vorhes's avatar Glenn Vorhes
Browse files

add additional verbs to axios

parent a038a179
No related branches found
No related tags found
No related merge requests found
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export declare const get: (endpoint: string, callback: (d: Object) => any, params?: Object, error?: (d?: Object) => any) => any;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
/**
* Created by glenn on 7/6/2017.
*/
var axios_1 = require("axios");
// export const CancelToken = axios.CancelToken;
/**
*
* @param obj
* @param keyArr
* @param defaultVal
* @returns
*/
function getValue(obj, keyArr, defaultVal) {
if (defaultVal === void 0) { defaultVal = null; }
var k = keyArr.splice(0, 1)[0];
if (keyArr.length == 0) {
return typeof obj[k] === 'undefined' ? defaultVal : obj[k];
}
else {
if (typeof obj[k] === 'undefined') {
throw "key error: " + k + " " + obj.toString();
}
else {
return getValue(obj[k], keyArr);
}
}
}
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
exports.get = function (endpoint, callback, params, error) {
if (params === void 0) { params = {}; }
if (error === void 0) { error = function () { }; }
axios_1.default.get(endpoint, { params: params }).then(function (response) {
var data = getValue(response, ['data'], null);
callback(data);
}).catch(function (reason) {
error(reason);
});
};
//# sourceMappingURL=_axios.js.map
\ No newline at end of file
{"version":3,"file":"_axios.js","sourceRoot":"","sources":["../../src/api/_axios.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,+BAA0B;AAE1B,gDAAgD;AAEhD;;;;;;GAMG;AACH,kBAAkB,GAAyB,EAAE,MAAgB,EAAE,UAAsB;IAAtB,2BAAA,EAAA,iBAAsB;IACjF,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/B,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,EAAE,CAAC,CAAC,OAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC;YACjC,MAAM,gBAAc,CAAC,SAAI,GAAG,CAAC,QAAQ,EAAI,CAAC;QAC9C,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;AACL,CAAC;AAGD;;;;;;;GAOG;AACU,QAAA,GAAG,GAAG,UAAC,QAAgB,EACV,QAA4B,EAC5B,MAAmB,EACnB,KAAqC;IADrC,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAC3D,eAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,UAAC,QAAa;QAErD,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9C,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAC,MAAW;QACjB,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC","sourcesContent":["/**\r\n * Created by glenn on 7/6/2017.\r\n */\r\nimport axios from 'axios';\r\n\r\n// export const CancelToken = axios.CancelToken;\r\n\r\n/**\r\n *\r\n * @param obj\r\n * @param keyArr\r\n * @param defaultVal\r\n * @returns\r\n */\r\nfunction getValue(obj: { [s: string]: any }, keyArr: string[], defaultVal: any = null): any {\r\n let k = keyArr.splice(0, 1)[0];\r\n\r\n if (keyArr.length == 0) {\r\n return typeof obj[k] === 'undefined' ? defaultVal : obj[k];\r\n } else {\r\n if (typeof obj[k] === 'undefined') {\r\n throw `key error: ${k} ${obj.toString()}`;\r\n } else {\r\n return getValue(obj[k], keyArr);\r\n }\r\n }\r\n}\r\n\r\n\r\n/**\r\n *\r\n * @param {string} endpoint\r\n * @param {(d: Object) => any} callback\r\n * @param {Object} params\r\n * @param {(d: Object) => any} error\r\n * @returns {any}\r\n */\r\nexport const get = (endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}): any => {\r\n axios.get(endpoint, {params: params}).then((response: any) => {\r\n\r\n let data = getValue(response, ['data'], null);\r\n callback(data);\r\n }).catch((reason: any) => {\r\n error(reason);\r\n });\r\n};\r\n"]}
\ No newline at end of file
......@@ -7,3 +7,30 @@
* @returns {any}
*/
export declare const get: (endpoint: string, callback: (d: Object) => any, params?: Object, error?: (d?: Object) => any) => any;
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export declare const post: (endpoint: string, callback: (d: Object) => any, params?: Object, error?: (d?: Object) => any) => any;
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export declare const delete_: (endpoint: string, callback: (d: Object) => any, params?: Object, error?: (d?: Object) => any) => any;
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export declare const put: (endpoint: string, callback: (d: Object) => any, params?: Object, error?: (d?: Object) => any) => any;
......@@ -27,6 +27,33 @@ function getValue(obj, keyArr, defaultVal) {
}
}
}
function _axiosHelper(endpoint, callback, params, error, verb) {
if (params === void 0) { params = {}; }
if (error === void 0) { error = function () { }; }
var f;
switch (verb) {
case 'get':
f = axios_1.default.get;
break;
case 'post':
f = axios_1.default.post;
break;
case 'put':
f = axios_1.default.put;
break;
case 'delete':
f = axios_1.default.delete;
break;
default:
throw 'axios verb not found';
}
f(endpoint, { params: params }).then(function (response) {
var data = getValue(response, ['data'], null);
callback(data);
}).catch(function (reason) {
error(reason);
});
}
/**
*
* @param {string} endpoint
......@@ -38,11 +65,45 @@ function getValue(obj, keyArr, defaultVal) {
exports.get = function (endpoint, callback, params, error) {
if (params === void 0) { params = {}; }
if (error === void 0) { error = function () { }; }
axios_1.default.get(endpoint, { params: params }).then(function (response) {
var data = getValue(response, ['data'], null);
callback(data);
}).catch(function (reason) {
error(reason);
});
_axiosHelper(endpoint, callback, params, error, 'get');
};
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
exports.post = function (endpoint, callback, params, error) {
if (params === void 0) { params = {}; }
if (error === void 0) { error = function () { }; }
_axiosHelper(endpoint, callback, params, error, 'post');
};
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
exports.delete_ = function (endpoint, callback, params, error) {
if (params === void 0) { params = {}; }
if (error === void 0) { error = function () { }; }
_axiosHelper(endpoint, callback, params, error, 'delete');
};
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
exports.put = function (endpoint, callback, params, error) {
if (params === void 0) { params = {}; }
if (error === void 0) { error = function () { }; }
_axiosHelper(endpoint, callback, params, error, 'put');
};
//# sourceMappingURL=axios.js.map
\ No newline at end of file
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/api/axios.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,+BAA0B;AAE1B,gDAAgD;AAEhD;;;;;;GAMG;AACH,kBAAkB,GAAyB,EAAE,MAAgB,EAAE,UAAsB;IAAtB,2BAAA,EAAA,iBAAsB;IACjF,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/B,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,EAAE,CAAC,CAAC,OAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC;YACjC,MAAM,gBAAc,CAAC,SAAI,GAAG,CAAC,QAAQ,EAAI,CAAC;QAC9C,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;AACL,CAAC;AAGD;;;;;;;GAOG;AACU,QAAA,GAAG,GAAG,UAAC,QAAgB,EACV,QAA4B,EAC5B,MAAmB,EACnB,KAAqC;IADrC,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAC3D,eAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,UAAC,QAAa;QAErD,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9C,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAC,MAAW;QACjB,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC","sourcesContent":["/**\r\n * Created by glenn on 7/6/2017.\r\n */\r\nimport axios from 'axios';\r\n\r\n// export const CancelToken = axios.CancelToken;\r\n\r\n/**\r\n *\r\n * @param obj\r\n * @param keyArr\r\n * @param defaultVal\r\n * @returns\r\n */\r\nfunction getValue(obj: { [s: string]: any }, keyArr: string[], defaultVal: any = null): any {\r\n let k = keyArr.splice(0, 1)[0];\r\n\r\n if (keyArr.length == 0) {\r\n return typeof obj[k] === 'undefined' ? defaultVal : obj[k];\r\n } else {\r\n if (typeof obj[k] === 'undefined') {\r\n throw `key error: ${k} ${obj.toString()}`;\r\n } else {\r\n return getValue(obj[k], keyArr);\r\n }\r\n }\r\n}\r\n\r\n\r\n/**\r\n *\r\n * @param {string} endpoint\r\n * @param {(d: Object) => any} callback\r\n * @param {Object} params\r\n * @param {(d: Object) => any} error\r\n * @returns {any}\r\n */\r\nexport const get = (endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}): any => {\r\n axios.get(endpoint, {params: params}).then((response: any) => {\r\n\r\n let data = getValue(response, ['data'], null);\r\n callback(data);\r\n }).catch((reason: any) => {\r\n error(reason);\r\n });\r\n};\r\n"]}
\ No newline at end of file
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/api/axios.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,+BAA0B;AAE1B,gDAAgD;AAEhD;;;;;;GAMG;AACH,kBAAkB,GAAyB,EAAE,MAAgB,EAAE,UAAsB;IAAtB,2BAAA,EAAA,iBAAsB;IACjF,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/B,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,EAAE,CAAC,CAAC,OAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC;YACjC,MAAM,gBAAc,CAAC,SAAI,GAAG,CAAC,QAAQ,EAAI,CAAC;QAC9C,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;AACL,CAAC;AAED,sBAAsB,QAAgB,EACZ,QAA4B,EAC5B,MAAmB,EACnB,KAAqC,EAAE,IAAY;IADnD,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAE3D,IAAI,CAAC,CAAC;IAEN,MAAM,CAAC,CAAC,IAAI,CAAC,CAAA,CAAC;QACV,KAAK,KAAK;YACN,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC;YACd,KAAK,CAAC;QACV,KAAK,MAAM;YACP,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC;YACf,KAAK,CAAC;QACV,KAAK,KAAK;YACN,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC;YACd,KAAK,CAAC;QACV,KAAK,QAAQ;YACT,CAAC,GAAG,eAAK,CAAC,MAAM,CAAC;YACjB,KAAK,CAAC;QACV;YACI,MAAM,sBAAsB,CAAC;IAErC,CAAC;IAED,CAAC,CAAC,QAAQ,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,UAAC,QAAa;QAC7C,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9C,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAC,MAAW;QACjB,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC;AAGD;;;;;;;GAOG;AACU,QAAA,GAAG,GAAG,UAAC,QAAgB,EACV,QAA4B,EAC5B,MAAmB,EACnB,KAAqC;IADrC,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAE3D,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAE3D,CAAC,CAAC;AAGF;;;;;;;GAOG;AACU,QAAA,IAAI,GAAG,UAAC,QAAgB,EACX,QAA4B,EAC5B,MAAmB,EACnB,KAAqC;IADrC,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAE3D,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AAE5D,CAAC,CAAC;AAGF;;;;;;;GAOG;AACU,QAAA,OAAO,GAAG,UAAC,QAAgB,EACd,QAA4B,EAC5B,MAAmB,EACnB,KAAqC;IADrC,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAE3D,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAE9D,CAAC,CAAC;AAEF;;;;;;;GAOG;AACU,QAAA,GAAG,GAAG,UAAC,QAAgB,EACV,QAA4B,EAC5B,MAAmB,EACnB,KAAqC;IADrC,uBAAA,EAAA,WAAmB;IACnB,sBAAA,EAAA,sBAAoC,CAAC;IAE3D,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAE3D,CAAC,CAAC","sourcesContent":["/**\r\n * Created by glenn on 7/6/2017.\r\n */\r\nimport axios from 'axios';\r\n\r\n// export const CancelToken = axios.CancelToken;\r\n\r\n/**\r\n *\r\n * @param obj\r\n * @param keyArr\r\n * @param defaultVal\r\n * @returns\r\n */\r\nfunction getValue(obj: { [s: string]: any }, keyArr: string[], defaultVal: any = null): any {\r\n let k = keyArr.splice(0, 1)[0];\r\n\r\n if (keyArr.length == 0) {\r\n return typeof obj[k] === 'undefined' ? defaultVal : obj[k];\r\n } else {\r\n if (typeof obj[k] === 'undefined') {\r\n throw `key error: ${k} ${obj.toString()}`;\r\n } else {\r\n return getValue(obj[k], keyArr);\r\n }\r\n }\r\n}\r\n\r\nfunction _axiosHelper(endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}, verb: string): any {\r\n\r\n let f;\r\n\r\n switch (verb){\r\n case 'get':\r\n f = axios.get;\r\n break;\r\n case 'post':\r\n f = axios.post;\r\n break;\r\n case 'put':\r\n f = axios.put;\r\n break;\r\n case 'delete':\r\n f = axios.delete;\r\n break;\r\n default:\r\n throw 'axios verb not found';\r\n\r\n }\r\n\r\n f(endpoint, {params: params}).then((response: any) => {\r\n let data = getValue(response, ['data'], null);\r\n callback(data);\r\n }).catch((reason: any) => {\r\n error(reason);\r\n });\r\n}\r\n\r\n\r\n/**\r\n *\r\n * @param {string} endpoint\r\n * @param {(d: Object) => any} callback\r\n * @param {Object} params\r\n * @param {(d: Object) => any} error\r\n * @returns {any}\r\n */\r\nexport const get = (endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}): any => {\r\n\r\n _axiosHelper(endpoint, callback, params, error, 'get');\r\n\r\n};\r\n\r\n\r\n/**\r\n *\r\n * @param {string} endpoint\r\n * @param {(d: Object) => any} callback\r\n * @param {Object} params\r\n * @param {(d: Object) => any} error\r\n * @returns {any}\r\n */\r\nexport const post = (endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}): any => {\r\n\r\n _axiosHelper(endpoint, callback, params, error, 'post');\r\n\r\n};\r\n\r\n\r\n/**\r\n *\r\n * @param {string} endpoint\r\n * @param {(d: Object) => any} callback\r\n * @param {Object} params\r\n * @param {(d: Object) => any} error\r\n * @returns {any}\r\n */\r\nexport const delete_ = (endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}): any => {\r\n\r\n _axiosHelper(endpoint, callback, params, error, 'delete');\r\n\r\n};\r\n\r\n/**\r\n *\r\n * @param {string} endpoint\r\n * @param {(d: Object) => any} callback\r\n * @param {Object} params\r\n * @param {(d: Object) => any} error\r\n * @returns {any}\r\n */\r\nexport const put = (endpoint: string,\r\n callback: (d: Object) => any,\r\n params: Object = {},\r\n error: (d?: Object) => any = () => {}): any => {\r\n\r\n _axiosHelper(endpoint, callback, params, error, 'put');\r\n\r\n};\r\n"]}
\ No newline at end of file
......@@ -6,7 +6,6 @@
import MapInteractionBase from './mapInteractionBase';
import ol = require('custom-ol');
import { LayerBaseVector } from "../layers/LayerBaseVector";
import { LayerBase } from "../layers/LayerBase";
import LayerEsriMapServer from "../layers/LayerEsriMapServer";
export interface popupChangedFunction {
($popContent: JQuery): any;
......@@ -60,8 +59,6 @@ export declare class MapPopupCls extends MapInteractionBase {
private _mapClickFunctions;
private _selectionLayerLookup;
private _arrPopupLayerIds;
private _arrPopupLayerNames;
private _arrPopupOlLayers;
private _arrPopupContentFunction;
private _selectionLayers;
/**
......@@ -78,7 +75,7 @@ export declare class MapPopupCls extends MapInteractionBase {
* map popup initialization
* @param {ol.Map} theMap - the ol map
*/
init(theMap: ol.Map): boolean;
init(theMap: ol.Map): void;
/**
* helper to select features
* @private
......@@ -139,7 +136,7 @@ export declare class MapPopupCls extends MapInteractionBase {
*
* @param {LayerBase} lyr - layer
*/
removeVectorPopup(lyr: LayerBase): void;
removeVectorPopup(lyr: LayerBaseVector): void;
/**
*
* @param {LayerEsriMapServer} lyr - map server layer
......
......@@ -68,9 +68,8 @@ var MapPopupCls = (function (_super) {
function MapPopupCls() {
var _this = _super.call(this, 'map popup') || this;
_this._arrPopupLayerIds = [];
_this._arrPopupLayerNames = [];
_this._arrPopupLayers = [];
_this._arrPopupOlLayers = [];
// this._arrPopupOlLayers = [];
_this._arrPopupContentFunction = [];
_this._$popupContainer = undefined;
_this._$popupContent = undefined;
......@@ -221,19 +220,22 @@ var MapPopupCls = (function (_super) {
return;
}
var pixel = _this.map.getEventPixel(evt['originalEvent']);
var hit = _this.map.hasFeatureAtPixel(pixel, function (lyrCandidate) {
for (var _i = 0, _a = _this._arrPopupOlLayers; _i < _a.length; _i++) {
var olLayer = _a[_i];
if (lyrCandidate == olLayer) {
return true;
var hit = false;
_this.map.forEachLayerAtPixel(pixel, function (lyr) {
if (hit) {
return;
}
for (var _i = 0, _a = _this._arrPopupLayers; _i < _a.length; _i++) {
var vLyr = _a[_i];
if (vLyr.olLayer == lyr) {
hit = true;
break;
}
}
return false;
});
var mapElement = _this.map.getTargetElement();
mapElement.style.cursor = hit ? 'pointer' : '';
});
return true;
};
/**
* helper to select features
......@@ -284,9 +286,18 @@ var MapPopupCls = (function (_super) {
var _this = this;
var layerFeatureObjectArray = [];
this.map.forEachFeatureAtPixel(pixel, function (feature, layer) {
var lyrIndex = _this._arrPopupOlLayers.indexOf(layer);
if (lyrIndex > -1) {
layerFeatureObjectArray.push(new FeatureLayerProperties(feature, _this._arrPopupLayers[lyrIndex], lyrIndex, _this._selectionLayers[lyrIndex]));
var hasLyr = false;
var j;
var lyr = null;
for (j = 0; j < _this._arrPopupLayers.length; j++) {
lyr = _this._arrPopupLayers[j];
if (lyr.olLayer === layer) {
hasLyr = true;
break;
}
}
if (hasLyr) {
layerFeatureObjectArray.push(new FeatureLayerProperties(feature, lyr, j, _this._selectionLayers[j]));
}
});
return layerFeatureObjectArray;
......@@ -366,9 +377,8 @@ var MapPopupCls = (function (_super) {
MapPopupCls.prototype.addVectorPopup = function (lyr, popupContentFunction, selectionStyle) {
var selectionLayer = this._addPopupLayer(lyr, selectionStyle);
this._arrPopupLayerIds.push(lyr.id);
this._arrPopupLayerNames.push(lyr.name);
this._arrPopupLayers.push(lyr);
this._arrPopupOlLayers.push(lyr.olLayer);
// this._arrPopupOlLayers.push(lyr.olLayer);
this._arrPopupContentFunction.push(popupContentFunction);
return selectionLayer;
};
......@@ -381,9 +391,8 @@ var MapPopupCls = (function (_super) {
var idx = this._arrPopupLayerIds.indexOf(lyr.id);
if (idx > -1) {
this._arrPopupLayerIds.splice(idx, 1);
this._arrPopupLayerNames.splice(idx, 1);
this._arrPopupLayers.splice(idx, 1);
this._arrPopupOlLayers.splice(idx, 1);
// this._arrPopupOlLayers.splice(idx, 1);
this._arrPopupContentFunction.splice(idx, 1);
this._selectionLayers.splice(idx, 1);
delete this._selectionLayerLookup[lyr.id];
......
This diff is collapsed.
......@@ -26,6 +26,39 @@ function getValue(obj: { [s: string]: any }, keyArr: string[], defaultVal: any =
}
}
function _axiosHelper(endpoint: string,
callback: (d: Object) => any,
params: Object = {},
error: (d?: Object) => any = () => {}, verb: string): any {
let f;
switch (verb){
case 'get':
f = axios.get;
break;
case 'post':
f = axios.post;
break;
case 'put':
f = axios.put;
break;
case 'delete':
f = axios.delete;
break;
default:
throw 'axios verb not found';
}
f(endpoint, {params: params}).then((response: any) => {
let data = getValue(response, ['data'], null);
callback(data);
}).catch((reason: any) => {
error(reason);
});
}
/**
*
......@@ -39,11 +72,60 @@ export const get = (endpoint: string,
callback: (d: Object) => any,
params: Object = {},
error: (d?: Object) => any = () => {}): any => {
axios.get(endpoint, {params: params}).then((response: any) => {
let data = getValue(response, ['data'], null);
callback(data);
}).catch((reason: any) => {
error(reason);
});
_axiosHelper(endpoint, callback, params, error, 'get');
};
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export const post = (endpoint: string,
callback: (d: Object) => any,
params: Object = {},
error: (d?: Object) => any = () => {}): any => {
_axiosHelper(endpoint, callback, params, error, 'post');
};
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export const delete_ = (endpoint: string,
callback: (d: Object) => any,
params: Object = {},
error: (d?: Object) => any = () => {}): any => {
_axiosHelper(endpoint, callback, params, error, 'delete');
};
/**
*
* @param {string} endpoint
* @param {(d: Object) => any} callback
* @param {Object} params
* @param {(d: Object) => any} error
* @returns {any}
*/
export const put = (endpoint: string,
callback: (d: Object) => any,
params: Object = {},
error: (d?: Object) => any = () => {}): any => {
_axiosHelper(endpoint, callback, params, error, 'put');
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment