ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Andreas Hocevar
2022-04-17 18:48:02 +02:00
parent 252671108f
commit 884c0c6129
7 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/browser/spec/ol/interaction/draw.test.js
View File

@@ -1968,14 +1968,14 @@ describe('ol.interaction.Draw', function () {
}
function drawPoint(geometryLayout) {
createDrawInteraction(GeometryType.POINT, geometryLayout);
createDrawInteraction('Point', geometryLayout);
simulateEvent('pointermove', 10, 20);
simulateEvent('pointerdown', 10, 20);
simulateEvent('pointerup', 10, 20);
}
function drawLineString(geometryLayout) {
createDrawInteraction(GeometryType.LINE_STRING, geometryLayout);
createDrawInteraction('LineString', geometryLayout);
// first point
simulateEvent('pointermove', 10, 20);
simulateEvent('pointerdown', 10, 20);
@@ -1992,7 +1992,7 @@ describe('ol.interaction.Draw', function () {
}
function drawPolygon(geometryLayout) {
createDrawInteraction(GeometryType.POLYGON, geometryLayout);
createDrawInteraction('Polygon', geometryLayout);
// first point
simulateEvent('pointermove', 10, 20);
simulateEvent('pointerdown', 10, 20);
@@ -2014,7 +2014,7 @@ describe('ol.interaction.Draw', function () {
}
function drawCircle(geometryLayout) {
createDrawInteraction(GeometryType.CIRCLE, geometryLayout);
createDrawInteraction('Circle', geometryLayout);
// first point
simulateEvent('pointermove', 10, 20);
simulateEvent('pointerdown', 10, 20);

3
test/node/ol/render/Feature.test.js
View File

@@ -1,4 +1,3 @@
import GeometryType from '../../../../src/ol/geom/GeometryType.js';
import RenderFeature, {
toFeature,
toGeometry,
@@ -141,7 +140,7 @@ describe('ol/render/Feature', function () {
],
]);
const renderFeature = new RenderFeature(
GeometryType.POLYGON,
'Polygon',
geometry.getFlatCoordinates().slice(),
geometry.getEndss().flat(1)
);