using updateObject

Author: nakul-py

packages/base/src/dialogs/layerBrowserDialog.tsx

@@ -112,7 +112,6 @@ export const LayerBrowserComponent: React.FC<ILayerBrowserDialogProps> = ({
         source: sourceId,
       },
       visible: true,
-      opacity: 1.0,
       name: tile.name + ' Layer',
     };
 

packages/base/src/formbuilder/editform.tsx

@@ -39,7 +39,7 @@ export class EditForm extends React.Component<IEditFormProps, any> {
       return;
     }
 
-    this.props.model.sharedModel.updateObjectParameters(id, properties);
+    this.props.model.sharedModel.updateObject(id, properties);
   }
 
   render() {
@@ -122,22 +122,10 @@ export class EditForm extends React.Component<IEditFormProps, any> {
 
                 const { opacity, ...params } = properties;
 
-                if (opacity !== undefined) {
-                  const layer = this.props.model.getLayer(this.props.layer);
-                  if (layer) {
-                    this.props.model.sharedModel.updateLayer(this.props.layer, {
-                      ...layer,
-                      opacity,
-                    });
-                  }
-                }
-
-                if (Object.keys(params).length > 0) {
-                  this.props.model.sharedModel.updateObjectParameters(
-                    this.props.layer,
-                    params,
-                  );
-                }
+                this.props.model.sharedModel.updateObject(this.props.layer, {
+                  opacity,
+                  parameters: params,
+                });
               }}
             />
           </div>

packages/schema/src/doc.ts

@@ -227,28 +227,37 @@ export class JupyterGISDoc
     }
   }
 
-  updateObjectParameters(
-    id: string,
-    value: IJGISLayer['parameters'] | IJGISSource['parameters'],
-  ) {
+  updateObject(id: string, value: Partial<IJGISLayer> | Partial<IJGISSource>) {
     const layer = this.getLayer(id);
     if (layer) {
-      layer.parameters = {
-        ...layer.parameters,
-        ...value,
+      const layerValue = value as Partial<IJGISLayer>;
+
+      const updatedLayer: IJGISLayer = {
+        ...layer,
+        ...layerValue,
+        parameters: {
+          ...layer.parameters,
+          ...(layerValue.parameters || {}),
+        },
       };
-
-      this.updateLayer(id, layer);
+      this.updateLayer(id, updatedLayer);
+      return;
     }
 
     const source = this.getLayerSource(id);
     if (source) {
-      source.parameters = {
-        ...source.parameters,
-        ...value,
+      const sourceValue = value as Partial<IJGISSource>;
+
+      const updatedSource: IJGISSource = {
+        ...source,
+        ...sourceValue,
+        parameters: {
+          ...source.parameters,
+          ...(sourceValue.parameters || {}),
+        },
       };
-
-      this.updateSource(id, source);
+      this.updateSource(id, updatedSource);
+      return;
     }
   }
 

packages/schema/src/interfaces.ts

@@ -122,9 +122,9 @@ export interface IJupyterGISDoc extends YDocument<IJupyterGISDocChange> {
   addLayerTreeItem(index: number, item: IJGISLayerItem): void;
   updateLayerTreeItem(index: number, item: IJGISLayerItem): void;
 
-  updateObjectParameters(
+  updateObject(
     id: string,
-    value: IJGISLayer['parameters'] | IJGISSource['parameters'],
+    value: Partial<IJGISLayer> | Partial<IJGISSource>,
   ): void;
   getObject(id: string): IJGISLayer | IJGISSource | undefined;