Make add layer menus more consistent (#681)

Author: mfisher87

packages/base/src/commands.ts

@@ -278,7 +278,7 @@ export function addCommands(
    * Source and layers
    */
   commands.addCommand(CommandIDs.newRasterEntry, {
-    label: trans.__('New Raster Layer'),
+    label: trans.__('New Raster Tile Layer'),
     isEnabled: () => {
       return tracker.currentWidget
         ? tracker.currentWidget.model.sharedModel.editable
@@ -287,14 +287,14 @@ export function addCommands(
     execute: Private.createEntry({
       tracker,
       formSchemaRegistry,
-      title: 'Create Raster Layer',
+      title: 'Create Raster Tile Layer',
       createLayer: true,
       createSource: true,
       sourceData: {
         minZoom: 0,
         maxZoom: 24
       },
-      layerData: { name: 'Custom Raster Layer' },
+      layerData: { name: 'Custom Raster Tile Layer' },
       sourceType: 'RasterSource',
       layerType: 'RasterLayer'
     }),
@@ -508,133 +508,7 @@ export function addCommands(
     ...icons.get(CommandIDs.newGeoTiffEntry)
   });
 
-  // Layers only
-  commands.addCommand(CommandIDs.newRasterLayer, {
-    label: args =>
-      args.from === 'contextMenu'
-        ? trans.__('Raster')
-        : trans.__('Add Raster layer'),
-    isEnabled: () => {
-      return tracker.currentWidget
-        ? tracker.currentWidget.model.sharedModel.editable
-        : false;
-    },
-    execute: Private.createEntry({
-      tracker,
-      formSchemaRegistry,
-      title: 'Create Raster Layer',
-      createLayer: true,
-      createSource: false,
-      layerData: {
-        name: 'Custom Raster Layer'
-      },
-      sourceType: 'RasterSource',
-      layerType: 'RasterLayer'
-    }),
-    ...icons.get(CommandIDs.newVectorLayer)
-  });
-
-  commands.addCommand(CommandIDs.newVectorLayer, {
-    label: args =>
-      args.from === 'contextMenu'
-        ? trans.__('Vector')
-        : trans.__('Add New Vector layer'),
-    isEnabled: () => {
-      return tracker.currentWidget
-        ? tracker.currentWidget.model.sharedModel.editable
-        : false;
-    },
-    execute: Private.createEntry({
-      tracker,
-      formSchemaRegistry,
-      title: 'Create Vector Layer',
-      createLayer: true,
-      createSource: false,
-      layerData: {
-        name: 'Custom Vector Layer'
-      },
-      sourceType: 'VectorTileSource',
-      layerType: 'VectorTileLayer'
-    }),
-    ...icons.get(CommandIDs.newVectorLayer)
-  });
-
-  commands.addCommand(CommandIDs.newHillshadeLayer, {
-    label: args =>
-      args.from === 'contextMenu'
-        ? trans.__('Hillshade')
-        : trans.__('Add Hillshade layer'),
-    isEnabled: () => {
-      return tracker.currentWidget
-        ? tracker.currentWidget.model.sharedModel.editable
-        : false;
-    },
-    execute: Private.createEntry({
-      tracker,
-      formSchemaRegistry,
-      title: 'Create Hillshade Layer',
-      createLayer: true,
-      createSource: false,
-      layerData: {
-        name: 'Custom Hillshade Layer'
-      },
-      sourceType: 'RasterDemSource',
-      layerType: 'HillshadeLayer'
-    }),
-    ...icons.get(CommandIDs.newHillshadeLayer)
-  });
-
-  commands.addCommand(CommandIDs.newImageLayer, {
-    label: args =>
-      args.from === 'contextMenu'
-        ? trans.__('Image')
-        : trans.__('Add Image layer'),
-    isEnabled: () => {
-      return tracker.currentWidget
-        ? tracker.currentWidget.model.sharedModel.editable
-        : false;
-    },
-    execute: Private.createEntry({
-      tracker,
-      formSchemaRegistry,
-      title: 'Create Image Layer',
-      createLayer: true,
-      createSource: false,
-      layerData: {
-        name: 'Custom Image Layer'
-      },
-      sourceType: 'ImageSource',
-      layerType: 'RasterLayer'
-    }),
-    ...icons.get(CommandIDs.newImageLayer)
-  });
-
-  commands.addCommand(CommandIDs.newVideoLayer, {
-    label: args =>
-      args.from === 'contextMenu'
-        ? trans.__('Video')
-        : trans.__('Add Video layer'),
-    isEnabled: () => {
-      return tracker.currentWidget
-        ? tracker.currentWidget.model.sharedModel.editable
-        : false;
-    },
-    execute: Private.createEntry({
-      tracker,
-      formSchemaRegistry,
-      title: 'Create Video Layer',
-      createLayer: true,
-      createSource: false,
-      layerData: {
-        name: 'Custom Video Layer'
-      },
-      sourceType: 'VideoSource',
-      layerType: 'RasterLayer'
-    }),
-    ...icons.get(CommandIDs.newVideoLayer)
-  });
-
-  commands.addCommand(CommandIDs.newShapefileLayer, {
+  commands.addCommand(CommandIDs.newShapefileEntry, {
     label: trans.__('New Shapefile Layer'),
     isEnabled: () => {
       return tracker.currentWidget
@@ -652,30 +526,7 @@ export function addCommands(
       sourceType: 'ShapefileSource',
       layerType: 'VectorLayer'
     }),
-    ...icons.get(CommandIDs.newShapefileLayer)
-  });
-
-  commands.addCommand(CommandIDs.newHeatmapLayer, {
-    label: args =>
-      args.from === 'contextMenu'
-        ? trans.__('Heatmap')
-        : trans.__('Add HeatmapLayer'),
-    isEnabled: () => {
-      return tracker.currentWidget
-        ? tracker.currentWidget.model.sharedModel.editable
-        : false;
-    },
-    execute: Private.createEntry({
-      tracker,
-      formSchemaRegistry,
-      title: 'Create Heatmap Layer',
-      createLayer: true,
-      createSource: false,
-      layerData: { name: 'Custom Heatmap Layer' },
-      sourceType: 'GeoJSONSource',
-      layerType: 'HeatmapLayer'
-    }),
-    ...icons.get(CommandIDs.newHeatmapLayer)
+    ...icons.get(CommandIDs.newShapefileEntry)
   });
 
   /**

packages/base/src/constants.ts

@@ -29,6 +29,7 @@ export namespace CommandIDs {
   // Layer and source
   export const newRasterEntry = 'jupytergis:newRasterEntry';
   export const newVectorTileEntry = 'jupytergis:newVectorTileEntry';
+  export const newShapefileEntry = 'jupytergis:newShapefileEntry';
   export const newGeoJSONEntry = 'jupytergis:newGeoJSONEntry';
   export const newHillshadeEntry = 'jupytergis:newHillshadeEntry';
   export const newImageEntry = 'jupytergis:newImageEntry';
@@ -39,16 +40,6 @@ export namespace CommandIDs {
   export const buffer = 'jupytergis:buffer';
   export const dissolve = 'jupytergis:dissolve';
 
-  // Layers only commands
-  export const newRasterLayer = 'jupytergis:newRasterLayer';
-  export const newVectorLayer = 'jupytergis:newVectorLayer';
-  export const newHillshadeLayer = 'jupytergis:newHillshadeLayer';
-  export const newImageLayer = 'jupytergis:newImageLayer';
-  export const newVideoLayer = 'jupytergis:newVideoLayer';
-  export const newShapefileLayer = 'jupytergis:newShapefileLayer';
-  export const newWebGlTileLayer = 'jupytergis:newWebGlTileLayer';
-  export const newHeatmapLayer = 'jupytergis:newHeatmapLayer';
-
   // Layer and group actions
   export const renameLayer = 'jupytergis:renameLayer';
   export const removeLayer = 'jupytergis:removeLayer';
@@ -103,7 +94,7 @@ const iconObject = {
   [CommandIDs.newHillshadeEntry]: { icon: moundIcon },
   [CommandIDs.newImageEntry]: { iconClass: 'fa fa-image' },
   [CommandIDs.newVideoEntry]: { iconClass: 'fa fa-video' },
-  [CommandIDs.newShapefileLayer]: { iconClass: 'fa fa-file' },
+  [CommandIDs.newShapefileEntry]: { iconClass: 'fa fa-file' },
   [CommandIDs.newGeoTiffEntry]: { iconClass: 'fa fa-image' },
   [CommandIDs.symbology]: { iconClass: 'fa fa-brush' },
   [CommandIDs.identify]: { icon: infoIcon },

packages/base/src/index.ts

@@ -12,3 +12,4 @@ export * from './tools';
 export * from './types';
 export * from './widget';
 export * from './annotations';
+export * from './menus';

packages/base/src/menus.ts

@@ -0,0 +1,60 @@
+import { Menu } from '@lumino/widgets';
+import { CommandRegistry } from '@lumino/commands';
+
+import { CommandIDs } from './constants';
+import { rasterIcon } from './icons';
+
+export const vectorSubMenu = (commands: CommandRegistry) => {
+  const subMenu = new Menu({ commands });
+
+  subMenu.title.label = 'Add Vector Layer';
+  subMenu.title.iconClass = 'fa fa-vector-square';
+  subMenu.id = 'jp-gis-toolbar-vector-menu';
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newVectorTileEntry
+  });
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newGeoJSONEntry
+  });
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newShapefileEntry
+  });
+
+  return subMenu;
+};
+
+export const rasterSubMenu = (commands: CommandRegistry) => {
+  const subMenu = new Menu({ commands });
+
+  subMenu.title.label = 'Add Raster Layer';
+  subMenu.title.icon = rasterIcon;
+  subMenu.id = 'jp-gis-toolbar-raster-menu';
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newRasterEntry
+  });
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newHillshadeEntry
+  });
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newImageEntry
+  });
+
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newGeoTiffEntry
+  });
+
+  return subMenu;
+};