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

Improve Draw type to mode conversion

Browse Source 
Throw error if Draw is configured with an invalid type.
This commit is contained in:
Maximilian Krög
2020-12-19 17:58:56 +01:00
parent 3cab5f3099
commit 288fd0b74c
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ol/interaction/Draw.js
View File

@@ -1227,23 +1227,21 @@ export function createBox() {
* @return {Mode} Drawing mode.
*/
function getMode(type) {
let mode;
if (type === GeometryType.POINT || type === GeometryType.MULTI_POINT) {
mode = Mode.POINT;
} else if (
type === GeometryType.LINE_STRING ||
type === GeometryType.MULTI_LINE_STRING
) {
mode = Mode.LINE_STRING;
} else if (
type === GeometryType.POLYGON ||
type === GeometryType.MULTI_POLYGON
) {
mode = Mode.POLYGON;
} else if (type === GeometryType.CIRCLE) {
mode = Mode.CIRCLE;
switch (type) {
case GeometryType.POINT:
case GeometryType.MULTI_POINT:
return Mode.POINT;
case GeometryType.LINE_STRING:
case GeometryType.MULTI_LINE_STRING:
return Mode.LINE_STRING;
case GeometryType.POLYGON:
case GeometryType.MULTI_POLYGON:
return Mode.POLYGON;
case GeometryType.CIRCLE:
return Mode.CIRCLE;
default:
throw new Error('Invalid type: ' + type);
}
return /** @type {!Mode} */ (mode);
}
export default Draw;

2
test/spec/ol/interaction/draw.test.js
View File

@@ -1381,7 +1381,7 @@ describe('ol.interaction.Draw', function () {
describe('#getOverlay', function () {
it('returns the feature overlay layer', function () {
const draw = new Draw({});
const draw = new Draw({type: 'Point'});
expect(draw.getOverlay()).to.eql(draw.overlay_);
});
});