@jupytergis/schema 0.1.6 → 0.1.7

package/lib/_interface/forms.json

@@ -344,6 +344,53 @@
         "multipleOf": 0.1,
         "minimum": 0,
         "maximum": 1
+      },
+      "symbologyState": {
+        "type": "object",
+        "description": "The state of the symbology panel options",
+        "required": [
+          "renderType"
+        ],
+        "properties": {
+          "renderType": {
+            "type": "string",
+            "enum": [
+              "Single Symbol",
+              "Graduated",
+              "Categorized"
+            ]
+          },
+          "value": {
+            "type": "string"
+          },
+          "method": {
+            "type": "string",
+            "enum": [
+              "color",
+              "radius"
+            ]
+          },
+          "colorRamp": {
+            "type": "string",
+            "default": "cool"
+          },
+          "nClasses": {
+            "type": "string",
+            "default": "9"
+          },
+          "mode": {
+            "type": "string",
+            "default": "equal interval",
+            "enum": [
+              "quantile",
+              "equal interval",
+              "jenks",
+              "pretty",
+              "logarithmic"
+            ]
+          }
+        },
+        "additionalProperties": false
       }
     }
   },
@@ -491,6 +538,52 @@
           }
         ],
         "description": "The color of the the object"
+      },
+      "symbologyState": {
+        "type": "object",
+        "description": "The state of the symbology panel options",
+        "required": [
+          "renderType",
+          "band",
+          "interpolation",
+          "colorRamp",
+          "nClasses",
+          "mode"
+        ],
+        "properties": {
+          "renderType": {
+            "type": "string"
+          },
+          "band": {
+            "type": "number"
+          },
+          "interpolation": {
+            "type": "string",
+            "enum": [
+              "discrete",
+              "linear",
+              "exact"
+            ]
+          },
+          "colorRamp": {
+            "type": "string",
+            "default": "cool"
+          },
+          "nClasses": {
+            "type": "string",
+            "default": "9"
+          },
+          "mode": {
+            "type": "string",
+            "default": "equal interval",
+            "enum": [
+              "continuous",
+              "equal interval",
+              "quantile"
+            ]
+          }
+        },
+        "additionalProperties": false
       }
     }
   },

package/lib/_interface/vectorlayer.d.ts

@@ -31,4 +31,15 @@ export interface IVectorLayer {
    * The opacity of the the object
    */
   opacity?: number;
+  /**
+   * The state of the symbology panel options
+   */
+  symbologyState?: {
+    renderType: "Single Symbol" | "Graduated" | "Categorized";
+    value?: string;
+    method?: "color" | "radius";
+    colorRamp?: string;
+    nClasses?: string;
+    mode?: "quantile" | "equal interval" | "jenks" | "pretty" | "logarithmic";
+  };
 }

package/lib/_interface/webGlLayer.d.ts

@@ -21,4 +21,15 @@ export interface IWebGlLayer {
    * The color of the the object
    */
   color?: string | number | (string | number | (number | string | (number | string)[])[])[];
+  /**
+   * The state of the symbology panel options
+   */
+  symbologyState?: {
+    renderType: string;
+    band: number;
+    interpolation: "discrete" | "linear" | "exact";
+    colorRamp: string;
+    nClasses: string;
+    mode: "continuous" | "equal interval" | "quantile";
+  };
 }

package/lib/doc.d.ts

@@ -1,9 +1,12 @@
 import { MapChange, YDocument } from '@jupyter/ydoc';
+import { JSONObject } from '@lumino/coreutils';
 import { ISignal } from '@lumino/signaling';
 import { IJGISLayer, IJGISLayerItem, IJGISLayerTree, IJGISLayers, IJGISOptions, IJGISSource, IJGISSources } from './_interface/jgis';
 import { IDict, IJGISLayerDocChange, IJGISLayerTreeDocChange, IJGISSourceDocChange, IJupyterGISDoc, IJupyterGISDocChange } from './interfaces';
 export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> implements IJupyterGISDoc {
     constructor();
+    getSource(): JSONObject;
+    setSource(value: JSONObject): void;
     dispose(): void;
     get version(): string;
     get layers(): IJGISLayers;
@@ -13,7 +16,7 @@ export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> imple
     get layerTree(): IJGISLayerTree;
     set layerTree(layerTree: IJGISLayerTree);
     getLayer(id: string): IJGISLayer | undefined;
-    getSource(id: string): IJGISSource | undefined;
+    getLayerSource(id: string): IJGISSource | undefined;
     set options(options: IJGISOptions);
     get options(): IJGISOptions;
     get layersChanged(): ISignal<IJupyterGISDoc, IJGISLayerDocChange>;

package/lib/doc.js

@@ -24,6 +24,31 @@ export class JupyterGISDoc extends YDocument {
         this._sources.observeDeep(this._sourcesObserver.bind(this));
         this._options.observe(this._optionsObserver.bind(this));
     }
+    getSource() {
+        const layers = this._layers.toJSON();
+        const layerTree = this._layerTree.toJSON();
+        const options = this._options.toJSON();
+        const sources = this._sources.toJSON();
+        return { layers, layerTree, sources, options };
+    }
+    setSource(value) {
+        if (!value) {
+            return;
+        }
+        this.transact(() => {
+            var _a, _b, _c, _d;
+            const layers = (_a = value['layers']) !== null && _a !== void 0 ? _a : {};
+            Object.entries(layers).forEach(([key, val]) => this._layers.set(key, val));
+            const layerTree = (_b = value['layerTree']) !== null && _b !== void 0 ? _b : [];
+            layerTree.forEach(layer => {
+                this._layerTree.push([layer]);
+            });
+            const options = (_c = value['options']) !== null && _c !== void 0 ? _c : {};
+            Object.entries(options).forEach(([key, val]) => this._options.set(key, val));
+            const sources = (_d = value['sources']) !== null && _d !== void 0 ? _d : {};
+            Object.entries(sources).forEach(([key, val]) => this._sources.set(key, val));
+        });
+    }
     dispose() {
         super.dispose();
     }
@@ -65,7 +90,7 @@ export class JupyterGISDoc extends YDocument {
         }
         return JSONExt.deepCopy(this._layers.get(id));
     }
-    getSource(id) {
+    getLayerSource(id) {
         if (!this._sources.has(id)) {
             return undefined;
         }
@@ -129,7 +154,7 @@ export class JupyterGISDoc extends YDocument {
         if (layer) {
             return layer;
         }
-        const source = this.getSource(id);
+        const source = this.getLayerSource(id);
         if (source) {
             return source;
         }
@@ -140,7 +165,7 @@ export class JupyterGISDoc extends YDocument {
             layer.parameters = Object.assign(Object.assign({}, layer.parameters), value);
             this.updateLayer(id, layer);
         }
-        const source = this.getSource(id);
+        const source = this.getLayerSource(id);
         if (source) {
             source.parameters = Object.assign(Object.assign({}, source.parameters), value);
             this.updateSource(id, source);

package/lib/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { ICollaborativeDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { Delta, DocumentChange, MapChange, StateChange, YDocument } from '@jupyter/ydoc';
 import { IWidgetTracker } from '@jupyterlab/apputils';
 import { IChangedArgs } from '@jupyterlab/coreutils';
@@ -58,7 +58,7 @@ export interface IJupyterGISDoc extends YDocument<IJupyterGISDocChange> {
     addLayer(id: string, value: IJGISLayer, groupName?: string, position?: number): void;
     updateLayer(id: string, value: IJGISLayer): void;
     sourceExists(id: string): boolean;
-    getSource(id: string): IJGISSource | undefined;
+    getLayerSource(id: string): IJGISSource | undefined;
     removeSource(id: string): void;
     addSource(id: string, value: IJGISSource): void;
     updateSource(id: string, value: IJGISSource): void;

package/lib/model.d.ts

@@ -1,4 +1,4 @@
-import { ICollaborativeDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { MapChange } from '@jupyter/ydoc';
 import { IChangedArgs } from '@jupyterlab/coreutils';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
@@ -10,7 +10,7 @@ import { IJGISLayerDocChange, IJGISLayerTreeDocChange, IJGISSourceDocChange, IJu
 export declare class JupyterGISModel implements IJupyterGISModel {
     constructor(options: DocumentRegistry.IModelOptions<IJupyterGISDoc>);
     private _onSharedModelChanged;
-    readonly collaborative = true;
+    readonly collaborative: boolean;
     get sharedModel(): IJupyterGISDoc;
     get isDisposed(): boolean;
     get contentChanged(): ISignal<this, void>;

package/lib/model.js

@@ -12,7 +12,7 @@ export class JupyterGISModel {
                 this.dirty = true;
             }
         };
-        this.collaborative = true;
+        this.collaborative = document.querySelectorAll('[data-jupyter-lite-root]')[0] === undefined;
         this._onClientStateChanged = (changed) => {
             const clients = this.sharedModel.awareness.getStates();
             this._clientStateChanged.emit(clients);
@@ -127,11 +127,11 @@ export class JupyterGISModel {
         const validate = ajv.compile(jgisSchema);
         const valid = validate(jsonData);
         if (!valid) {
-            let errorMsg = 'File format errors:\n';
+            let errorMsg = 'JupyterGIS format errors:\n';
             for (const error of validate.errors || []) {
                 errorMsg = `${errorMsg}- ${error.instancePath} ${error.message}\n`;
             }
-            throw Error(errorMsg);
+            console.warn(errorMsg);
         }
         this.sharedModel.transact(() => {
             var _a, _b, _c, _d;
@@ -186,7 +186,7 @@ export class JupyterGISModel {
         return this.sharedModel.getLayer(id);
     }
     getSource(id) {
-        return this.sharedModel.getSource(id);
+        return this.sharedModel.getLayerSource(id);
     }
     /**
      * Get a {[key: id]: name} dictionary of sources for a given source type

package/lib/schema/vectorlayer.json

@@ -30,6 +30,44 @@
             "multipleOf": 0.1,
             "minimum": 0,
             "maximum": 1
+        },
+        "symbologyState": {
+            "type": "object",
+            "description": "The state of the symbology panel options",
+            "required": ["renderType"],
+            "properties": {
+                "renderType": {
+                    "type": "string",
+                    "enum": ["Single Symbol", "Graduated", "Categorized"]
+                },
+                "value": {
+                    "type": "string"
+                },
+                "method": {
+                    "type": "string",
+                    "enum": ["color", "radius"]
+                },
+                "colorRamp": {
+                    "type": "string",
+                    "default": "cool"
+                },
+                "nClasses": {
+                    "type": "string",
+                    "default": "9"
+                },
+                "mode": {
+                    "type": "string",
+                    "default": "equal interval",
+                    "enum": [
+                        "quantile",
+                        "equal interval",
+                        "jenks",
+                        "pretty",
+                        "logarithmic"
+                    ]
+                }
+            },
+            "additionalProperties": false
         }
     }
 }

package/lib/schema/webGlLayer.json

@@ -47,6 +47,44 @@
                 }
             ],
             "description": "The color of the the object"
+        },
+        "symbologyState": {
+            "type": "object",
+            "description": "The state of the symbology panel options",
+            "required": [
+                "renderType",
+                "band",
+                "interpolation",
+                "colorRamp",
+                "nClasses",
+                "mode"
+            ],
+            "properties": {
+                "renderType": {
+                    "type": "string"
+                },
+                "band": {
+                    "type": "number"
+                },
+                "interpolation": {
+                    "type": "string",
+                    "enum": ["discrete", "linear", "exact"]
+                },
+                "colorRamp": {
+                    "type": "string",
+                    "default": "cool"
+                },
+                "nClasses": {
+                    "type": "string",
+                    "default": "9"
+                },
+                "mode": {
+                    "type": "string",
+                    "default": "equal interval",
+                    "enum": ["continuous", "equal interval", "quantile"]
+                }
+            },
+            "additionalProperties": false
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/schema",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A JupyterGIS schema package.",
   "keywords": [
     "jupytergis"
@@ -25,12 +25,12 @@
     "url": "https://github.com/geojupyter/jupytergis.git"
   },
   "scripts": {
-    "build": "jlpm build:schema && jlpm run build:lib",
+    "build": "jlpm build:schema && jlpm build:lib",
     "build:schema": "jlpm build:schema:js && jlpm build:schema:py",
     "build:schema:js": "json2ts -i src/schema -o src/_interface --no-unknownAny --unreachableDefinitions --cwd ./src/schema && cd src/schema && node ../../schema.js",
     "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytergis_lab/jupytergis_lab/notebook/objects/_schema --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema",
     "build:prod": "jlpm run clean && jlpm build:schema && jlpm run build:lib",
-    "build:lib": "tsc",
+    "build:lib": "tsc -b",
     "build:dev": "jlpm run build",
     "clean": "rimraf tsconfig.tsbuildinfo",
     "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
@@ -39,13 +39,13 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^9.0.9",
-    "@jupyter/docprovider": "^2.0.0",
-    "@jupyter/ydoc": "^1.0.0",
-    "@jupyterlab/apputils": "^4.0.0",
-    "@jupyterlab/coreutils": "^6.0.0",
-    "@jupyterlab/docregistry": "^4.0.0",
-    "@jupyterlab/services": "^7.0.0",
-    "@jupyterlab/ui-components": "^4.0.0",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
+    "@jupyterlab/apputils": "^4.3.0",
+    "@jupyterlab/coreutils": "^6.3.0",
+    "@jupyterlab/docregistry": "^4.3.0",
+    "@jupyterlab/services": "^7.3.0",
+    "@jupyterlab/ui-components": "^4.3.0",
     "@lumino/coreutils": "^2.0.0",
     "@lumino/signaling": "^2.0.0",
     "ajv": "8.16.0",