@jupytergis/schema 0.1.4 → 0.1.6

package/lib/_interface/forms.json

@@ -294,9 +294,8 @@
         "description": "The source layer to use"
       },
       "color": {
-        "type": "string",
-        "description": "The color of the the object",
-        "default": "#FF0000"
+        "type": "object",
+        "description": "The color of the the object"
       },
       "opacity": {
         "type": "number",
@@ -335,9 +334,8 @@
         "description": "The source layer to use"
       },
       "color": {
-        "type": "string",
-        "description": "The color of the the object",
-        "default": "#FF0000"
+        "type": "object",
+        "description": "The color of the the object"
       },
       "opacity": {
         "type": "number",

package/lib/_interface/jgis.d.ts

@@ -44,7 +44,6 @@ export interface IJGISContent {
   layers: IJGISLayers;
   sources: IJGISSources;
   layerTree?: IJGISLayerTree;
-  terrain?: IJGISTerrain;
   options?: IJGISOptions;
 }
 /**
@@ -114,17 +113,6 @@ export interface IJGISLayerGroup {
     [k: string]: any;
   };
 }
-/**
- * This interface was referenced by `IJGISContent`'s JSON-Schema
- * via the `definition` "jGISTerrain".
- */
-export interface IJGISTerrain {
-  /**
-   * The id of the DEM source
-   */
-  source: string;
-  exaggeration: number;
-}
 /**
  * This interface was referenced by `IJGISContent`'s JSON-Schema
  * via the `definition` "jGISOptions".

package/lib/_interface/vectorTileLayer.d.ts

@@ -24,7 +24,9 @@ export interface IVectorTileLayer {
   /**
    * The color of the the object
    */
-  color?: string;
+  color?: {
+    [k: string]: any;
+  };
   /**
    * The opacity of the the object
    */

package/lib/_interface/vectorlayer.d.ts

@@ -24,7 +24,9 @@ export interface IVectorLayer {
   /**
    * The color of the the object
    */
-  color?: string;
+  color?: {
+    [k: string]: any;
+  };
   /**
    * The opacity of the the object
    */

package/lib/doc.d.ts

@@ -1,6 +1,6 @@
 import { MapChange, YDocument } from '@jupyter/ydoc';
 import { ISignal } from '@lumino/signaling';
-import { IJGISLayer, IJGISLayerItem, IJGISLayerTree, IJGISLayers, IJGISOptions, IJGISSource, IJGISSources, IJGISTerrain } from './_interface/jgis';
+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();
@@ -12,8 +12,6 @@ export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> imple
     get sources(): IJGISSources;
     get layerTree(): IJGISLayerTree;
     set layerTree(layerTree: IJGISLayerTree);
-    get terrain(): IJGISTerrain;
-    set terrain(terrain: IJGISTerrain);
     getLayer(id: string): IJGISLayer | undefined;
     getSource(id: string): IJGISSource | undefined;
     set options(options: IJGISOptions);
@@ -22,7 +20,6 @@ export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> imple
     get layerTreeChanged(): ISignal<IJupyterGISDoc, IJGISLayerTreeDocChange>;
     get sourcesChanged(): ISignal<IJupyterGISDoc, IJGISSourceDocChange>;
     get optionsChanged(): ISignal<IJupyterGISDoc, MapChange>;
-    get terrainChanged(): ISignal<IJupyterGISDoc, IJGISTerrain>;
     layerExists(id: string): boolean;
     removeLayer(id: string): void;
     addLayer(id: string, value: IJGISLayer): void;
@@ -44,16 +41,13 @@ export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> imple
     private _layersObserver;
     private _layerTreeObserver;
     private _sourcesObserver;
-    private _terrainObserver;
     private _optionsObserver;
     private _layers;
     private _layerTree;
     private _sources;
     private _options;
-    private _terrain;
     private _optionsChanged;
     private _layersChanged;
     private _layerTreeChanged;
     private _sourcesChanged;
-    private _terrainChanged;
 }

package/lib/doc.js

@@ -12,19 +12,16 @@ export class JupyterGISDoc extends YDocument {
         this._layersChanged = new Signal(this);
         this._layerTreeChanged = new Signal(this);
         this._sourcesChanged = new Signal(this);
-        this._terrainChanged = new Signal(this);
         this._options = this.ydoc.getMap('options');
         this._layers = this.ydoc.getMap('layers');
         this._layerTree = this.ydoc.getArray('layerTree');
         this._sources = this.ydoc.getMap('sources');
-        this._terrain = this.ydoc.getMap('terrain');
         this.undoManager.addToScope(this._layers);
         this.undoManager.addToScope(this._sources);
         this.undoManager.addToScope(this._layerTree);
         this._layers.observeDeep(this._layersObserver.bind(this));
         this._layerTree.observe(this._layerTreeObserver.bind(this));
         this._sources.observeDeep(this._sourcesObserver.bind(this));
-        this._terrain.observe(this._terrainObserver.bind(this));
         this._options.observe(this._optionsObserver.bind(this));
     }
     dispose() {
@@ -62,16 +59,6 @@ export class JupyterGISDoc extends YDocument {
             this._layerTree.push(layerTree);
         });
     }
-    get terrain() {
-        return JSONExt.deepCopy(this._terrain.toJSON());
-    }
-    set terrain(terrain) {
-        this.transact(() => {
-            for (const [key, value] of Object.entries(terrain)) {
-                this._terrain.set(key, value);
-            }
-        });
-    }
     getLayer(id) {
         if (!this._layers.has(id)) {
             return undefined;
@@ -106,9 +93,6 @@ export class JupyterGISDoc extends YDocument {
     get optionsChanged() {
         return this._optionsChanged;
     }
-    get terrainChanged() {
-        return this._terrainChanged;
-    }
     layerExists(id) {
         return Boolean(this._getLayerAsYMap(id));
     }
@@ -245,7 +229,4 @@ export class JupyterGISDoc extends YDocument {
             this._sourcesChanged.emit({ sourceChange: changes });
         }
     }
-    _terrainObserver(event) {
-        this._terrainChanged.emit(this.terrain);
-    }
 }

package/lib/interfaces.d.ts

@@ -7,7 +7,7 @@ import { User } from '@jupyterlab/services';
 import { ISignal, Signal } from '@lumino/signaling';
 import { SplitPanel } from '@lumino/widgets';
 import { GeoJSON } from './_interface/geojsonsource';
-import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerItem, IJGISLayers, IJGISLayerTree, IJGISOptions, IJGISSource, IJGISSources, IJGISTerrain, SourceType } from './_interface/jgis';
+import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerItem, IJGISLayers, IJGISLayerTree, IJGISOptions, IJGISSource, IJGISSources, SourceType } from './_interface/jgis';
 import { IRasterSource } from './_interface/rastersource';
 export { IGeoJSONSource } from './_interface/geojsonsource';
 export interface IDict<T = any> {
@@ -50,7 +50,6 @@ export interface IJupyterGISDoc extends YDocument<IJupyterGISDocChange> {
     layers: IJGISLayers;
     sources: IJGISSources;
     layerTree: IJGISLayerTree;
-    terrain: IJGISTerrain;
     readonly editable: boolean;
     readonly toJGISEndpoint?: string;
     layerExists(id: string): boolean;
@@ -73,7 +72,6 @@ export interface IJupyterGISDoc extends YDocument<IJupyterGISDocChange> {
     layersChanged: ISignal<IJupyterGISDoc, IJGISLayerDocChange>;
     sourcesChanged: ISignal<IJupyterGISDoc, IJGISSourceDocChange>;
     layerTreeChanged: ISignal<IJupyterGISDoc, IJGISLayerTreeDocChange>;
-    terrainChanged: ISignal<IJupyterGISDoc, IJGISTerrain>;
 }
 export interface IJupyterGISDocChange extends DocumentChange {
     contextChange?: MapChange;
@@ -97,7 +95,6 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
     sharedLayersChanged: ISignal<IJupyterGISDoc, IJGISLayerDocChange>;
     sharedLayerTreeChanged: ISignal<IJupyterGISDoc, IJGISLayerTreeDocChange>;
     sharedSourcesChanged: ISignal<IJupyterGISDoc, IJGISSourceDocChange>;
-    terrainChanged: ISignal<IJupyterGISDoc, IJGISTerrain>;
     setDrive(value: ICollaborativeDrive, filePath: string): void;
     getContent(): IJGISContent;
     getLayers(): IJGISLayers;
@@ -114,7 +111,6 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
     getOptions(): IJGISOptions;
     setOptions(value: IJGISOptions): void;
     readGeoJSON(filepath: string): Promise<GeoJSON | undefined>;
-    setTerrain(terrain: IJGISTerrain): void;
     removeLayerGroup(groupName: string): void;
     renameLayerGroup(groupName: string, newName: string): void;
     moveItemsToGroup(items: string[], groupName: string, index?: number): void;

package/lib/model.d.ts

@@ -5,7 +5,7 @@ import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { PartialJSONObject } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 import { GeoJSON } from './_interface/geojsonsource';
-import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerTree, IJGISLayers, IJGISOptions, IJGISSource, IJGISSources, IJGISTerrain } from './_interface/jgis';
+import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerTree, IJGISLayers, IJGISOptions, IJGISSource, IJGISSources } from './_interface/jgis';
 import { IJGISLayerDocChange, IJGISLayerTreeDocChange, IJGISSourceDocChange, IJupyterGISClientState, IJupyterGISDoc, IJupyterGISModel, ISelection, IUserData } from './interfaces';
 export declare class JupyterGISModel implements IJupyterGISModel {
     constructor(options: DocumentRegistry.IModelOptions<IJupyterGISDoc>);
@@ -29,7 +29,6 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     get sharedLayersChanged(): ISignal<IJupyterGISDoc, IJGISLayerDocChange>;
     get sharedLayerTreeChanged(): ISignal<IJupyterGISDoc, IJGISLayerTreeDocChange>;
     get sharedSourcesChanged(): ISignal<IJupyterGISDoc, IJGISSourceDocChange>;
-    get terrainChanged(): ISignal<IJupyterGISDoc, IJGISTerrain>;
     get disposed(): ISignal<JupyterGISModel, void>;
     dispose(): void;
     toString(): string;
@@ -88,7 +87,6 @@ export declare class JupyterGISModel implements IJupyterGISModel {
      */
     addLayer(id: string, layer: IJGISLayer, groupName?: string, position?: number): void;
     removeLayer(layer_id: string): void;
-    setTerrain(terrain: IJGISTerrain): void;
     setOptions(value: IJGISOptions): void;
     getOptions(): IJGISOptions;
     syncSelected(value: {

package/lib/model.js

@@ -106,9 +106,6 @@ export class JupyterGISModel {
     get sharedSourcesChanged() {
         return this.sharedModel.sourcesChanged;
     }
-    get terrainChanged() {
-        return this.sharedModel.terrainChanged;
-    }
     get disposed() {
         return this._disposed;
     }
@@ -137,15 +134,11 @@ export class JupyterGISModel {
             throw Error(errorMsg);
         }
         this.sharedModel.transact(() => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             this.sharedModel.sources = (_a = jsonData.sources) !== null && _a !== void 0 ? _a : {};
             this.sharedModel.layers = (_b = jsonData.layers) !== null && _b !== void 0 ? _b : {};
             this.sharedModel.layerTree = (_c = jsonData.layerTree) !== null && _c !== void 0 ? _c : [];
-            this.sharedModel.terrain = (_d = jsonData.terrain) !== null && _d !== void 0 ? _d : {
-                source: '',
-                exaggeration: 0
-            };
-            this.sharedModel.options = (_e = jsonData.options) !== null && _e !== void 0 ? _e : {
+            this.sharedModel.options = (_d = jsonData.options) !== null && _d !== void 0 ? _d : {
                 latitude: 0,
                 longitude: 0,
                 zoom: 0,
@@ -173,8 +166,7 @@ export class JupyterGISModel {
             sources: this.sharedModel.sources,
             layers: this.sharedModel.layers,
             layerTree: this.sharedModel.layerTree,
-            options: this.sharedModel.options,
-            terrain: this.sharedModel.terrain
+            options: this.sharedModel.options
         };
     }
     setDrive(value, filePath) {
@@ -291,9 +283,6 @@ export class JupyterGISModel {
         this._removeLayerTreeLayer(this.getLayerTree(), layer_id);
         this.sharedModel.removeLayer(layer_id);
     }
-    setTerrain(terrain) {
-        this._sharedModel.terrain = terrain;
-    }
     setOptions(value) {
         this._sharedModel.options = value;
     }

package/lib/schema/jgis.json

@@ -13,9 +13,6 @@
         "layerTree": {
             "$ref": "#/definitions/jGISLayerTree"
         },
-        "terrain": {
-            "$ref": "#/definitions/jGISTerrain"
-        },
         "options": {
             "$ref": "#/definitions/jGISOptions"
         }
@@ -146,24 +143,6 @@
                 "$ref": "#/definitions/jGISLayerItem"
             }
         },
-        "jGISTerrain": {
-            "title": "IJGISTerrain",
-            "type": "object",
-            "default": {},
-            "required": ["source", "exaggeration"],
-            "additionalProperties": false,
-            "properties": {
-                "source": {
-                    "type": "string",
-                    "description": "The id of the DEM source",
-                    "default": ""
-                },
-                "exaggeration": {
-                    "type": "number",
-                    "default": 1
-                }
-            }
-        },
         "jGISOptions": {
             "title": "IJGISOptions",
             "type": "object",

package/lib/schema/vectorTileLayer.json

@@ -20,9 +20,8 @@
             "description": "The source layer to use"
         },
         "color": {
-            "type": "string",
-            "description": "The color of the the object",
-            "default": "#FF0000"
+            "type": "object",
+            "description": "The color of the the object"
         },
         "opacity": {
             "type": "number",

package/lib/schema/vectorlayer.json

@@ -20,9 +20,8 @@
             "description": "The source layer to use"
         },
         "color": {
-            "type": "string",
-            "description": "The color of the the object",
-            "default": "#FF0000"
+            "type": "object",
+            "description": "The color of the the object"
         },
         "opacity": {
             "type": "number",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/schema",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "A JupyterGIS schema package.",
   "keywords": [
     "jupytergis"