Remove custom geojson layer dialog

geojupyter · Jul 19, 2024 · afe6cf0 · afe6cf0
1 parent 205ec99
commit afe6cf0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 132 deletions.
diff --git a/packages/base/src/commands.ts b/packages/base/src/commands.ts
@@ -17,7 +17,6 @@ import { UUID } from '@lumino/coreutils';
 import { Ajv } from 'ajv';
 import * as geojson from 'geojson-schema/GeoJSON.json';
 
-import { GeoJSONLayerDialog } from './dialogs/geoJsonLayerDialog';
 import { LayerBrowserWidget } from './dialogs/layerBrowserDialog';
 import {
   DataErrorDialog,
@@ -340,9 +339,21 @@ namespace Private {
         return;
       }
 
-      const dialog = new GeoJSONLayerDialog({
-        model: current.context.model,
-        registry: formSchemaRegistry
+      const dialog = new CreationFormDialog({
+        context: current.context,
+        title: 'Create GeoJSON Layer',
+        createLayer: true,
+        createSource: true,
+        sourceData: {
+          minZoom: 0,
+          maxZoom: 0
+        },
+        layerData: {
+          name: 'Custom GeoJSON Layer'
+        },
+        sourceType: 'GeoJSONSource',
+        layerType: 'VectorLayer',
+        formSchemaRegistry
       });
       await dialog.launch();
     };
@@ -366,7 +377,7 @@ namespace Private {
         createSource: true,
         sourceData: {
           minZoom: 0,
-          maxZoom: 0,
+          maxZoom: 0
         },
         layerData: {
           name: 'Custom Vector Tile Layer'

diff --git a/packages/base/src/dialogs/formdialog.tsx b/packages/base/src/dialogs/formdialog.tsx
@@ -81,7 +81,9 @@ export class CreationFormDialog extends Dialog<IDict> {
     });
 
     // Disable ok button by default. It will be enabled automatically once the form is valid.
-    this.node.getElementsByClassName('jp-mod-accept')[0].setAttribute('disabled', '');
+    this.node
+      .getElementsByClassName('jp-mod-accept')[0]
+      .setAttribute('disabled', '');
 
     this.okSignal = new Signal(this);
     okSignalPromise.resolve(this.okSignal);

diff --git a/packages/base/src/dialogs/geoJsonLayerDialog.tsx b/packages/base/src/dialogs/geoJsonLayerDialog.tsx
diff --git a/packages/base/src/formbuilder/objectform/geojsonsource.ts b/packages/base/src/formbuilder/objectform/geojsonsource.ts
@@ -25,6 +25,9 @@ export class GeoJSONSourcePropertiesForm extends BaseForm {
       return;
     }
 
+    // This is not user-editable
+    delete schema.properties.valid;
+
     if (data.path !== '') {
       this.removeFormEntry('data', data, schema, uiSchema);
     }