Skip to content

Commit 43be2fd

Browse files
Update newDrawVectorLayer command.
1 parent 0765480 commit 43be2fd

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

packages/base/src/commands.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -885,19 +885,21 @@ export function addCommands(
885885
if (!selectedLayer) {
886886
return false;
887887
}
888-
889-
const canDrawVectorLayer = selectedSource.type === 'GeoJSONSource' && selectedSource.data;
890-
891-
if (
892-
tracker.currentWidget instanceof JupyterGISDocumentWidget &&
893-
canDrawVectorLayer
894-
) {
888+
if (tracker.currentWidget instanceof JupyterGISDocumentWidget) {
895889
const model = tracker.currentWidget?.content.currentViewModel
896890
.jGISModel as IJupyterGISModel;
897891
const parameters = selectedLayer.parameters;
898892
if (parameters) {
899-
const selectedvectorLayerSourceId = parameters?.source;
900-
model.selectedVectorLayerSourceId = selectedvectorLayerSourceId;
893+
const selectedSource = model.getSource(
894+
selectedLayer.parameters?.source
895+
);
896+
const canDrawVectorLayer =
897+
selectedSource?.type === 'GeoJSONSource' &&
898+
selectedSource?.parameters?.data;
899+
if (canDrawVectorLayer) {
900+
const selectedvectorLayerSourceId = parameters.source;
901+
model.selectedVectorLayerSourceId = selectedvectorLayerSourceId;
902+
}
901903
}
902904

903905
return model.isDrawVectorLayerEnabled;

0 commit comments

Comments
 (0)