Merge pull request #23 from antvis/touch

fix(event): add touch event
This commit is contained in:
@thinkinggis 2019-09-02 17:58:29 +08:00 committed by GitHub
commit 136a978ed7
4 changed files with 15 additions and 33 deletions

View File

@ -40,6 +40,10 @@ export default class EventContoller {
lnglat: { lng: lnglat.lng, lat: lnglat.lat } lnglat: { lng: lnglat.lng, lat: lnglat.lat }
}; };
if (featureId >= 0) { // 拾取到元素,或者离开元素 if (featureId >= 0) { // 拾取到元素,或者离开元素
if (type.substr(0, 5) === 'touch') {
type = 'click';
this.layer.emit('mousemove', target);
}
this.layer.emit(type, target); this.layer.emit(type, target);
this._selectedId = featureId; this._selectedId = featureId;
} }

View File

@ -33,7 +33,14 @@ class Picking {
window.addEventListener('resize', this._resizeHandler, false); window.addEventListener('resize', this._resizeHandler, false);
} }
pickdata(event) { pickdata(event) {
const point = { x: event.offsetX, y: event.offsetY, type: event.type, _parent: event }; let point = { x: event.offsetX, y: event.offsetY, type: event.type, _parent: event };
if (event.type.substr(0, 5) === 'touch') {
if (event.touches.length === 0) {
return;
}
const touch = event.touches[0];
point = { x: touch.clientX, y: touch.clientY, type: event.type, _parent: touch };
}
const normalisedPoint = { x: 0, y: 0 }; const normalisedPoint = { x: 0, y: 0 };
normalisedPoint.x = (point.x / this._width) * 2 - 1; normalisedPoint.x = (point.x / this._width) * 2 - 1;
normalisedPoint.y = -(point.y / this._height) * 2 + 1; normalisedPoint.y = -(point.y / this._height) * 2 + 1;

View File

@ -480,37 +480,6 @@ export default class Layer extends Base {
} }
} }
_initEvents() {
this.scene.on('pick-' + this.layerId, e => {
let { featureId, point2d, type } = e;
// TODO 瓦片图层获取选中数据信息
const lnglat = this.scene.containerToLngLat(point2d);
let feature = null;
let style = null;
if (featureId !== -999) {
const res = this.getSelectFeature(featureId, lnglat);
feature = res.feature;
style = res.style;
}
const target = {
featureId,
feature,
style,
pixel: point2d,
type,
lnglat: { lng: lnglat.lng, lat: lnglat.lat }
};
if (featureId >= 0) { // 拾取到元素,或者离开元素
this.emit(type, target);
}
if (featureId < 0 && this._activeIds >= 0) {
type = 'mouseleave';
this.emit(type, target);
}
this._activeIds = featureId;
});
}
getSelectFeature(featureId, lnglat) { getSelectFeature(featureId, lnglat) {
// return {}; // return {};
if (this.get('layerType') === 'tile') { if (this.get('layerType') === 'tile') {

View File

@ -144,6 +144,9 @@ export default class Scene extends Base {
'mousemove', 'mousemove',
'mousedown', 'mousedown',
'mouseleave', 'mouseleave',
'touchstart',
'touchmove',
'touchend',
'mouseup', 'mouseup',
'rightclick', 'rightclick',
'click', 'click',
@ -153,7 +156,6 @@ export default class Scene extends Base {
this._container.addEventListener(event, e => { this._container.addEventListener(event, e => {
// 要素拾取 // 要素拾取
if (e.target.nodeName !== 'CANVAS') return; if (e.target.nodeName !== 'CANVAS') return;
e.pixel || (e.pixel = e.point);
this._engine._picking.pickdata(e); this._engine._picking.pickdata(e);
}, true); }, true);
}); });