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

better map move pointer check

parent ea632de9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
dist/api/axios.js.map
+ 1
− 1
View file @ 48a19ac8
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/api/axios.ts"],"names":[],"mappings":"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","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
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/api/axios.ts"],"names":[],"mappings":"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","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 * @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
dist/olHelpers/mapPopupCls.js
+ 2
− 2
View file @ 48a19ac8
......@@ -221,13 +221,13 @@ var MapPopupCls = (function (_super) {
}
var pixel = _this.map.getEventPixel(evt['originalEvent']);
var hit = false;
_this.map.forEachLayerAtPixel(pixel, function (lyr) {
_this.map.forEachFeatureAtPixel(pixel, function (f, l) {
if (hit) {
return;
}
for (var _i = 0, _a = _this._arrPopupLayers; _i < _a.length; _i++) {
var vLyr = _a[_i];
if (vLyr.olLayer == lyr) {
if (vLyr.olLayer == l) {
hit = true;
break;
}
......
dist/olHelpers/mapPopupCls.js.map
+ 1
− 1
View file @ 48a19ac8
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment