@jupytergis/schema 0.16.0-alpha.0 → 0.16.0-alpha.1

package/lib/_interface/forms.json

@@ -311,78 +311,6 @@
       }
     }
   },
-  "HeatmapLayer": {
-    "type": "object",
-    "required": [
-      "source",
-      "blur",
-      "radius"
-    ],
-    "additionalProperties": false,
-    "properties": {
-      "source": {
-        "type": "string",
-        "description": "The id of the source"
-      },
-      "opacity": {
-        "type": "number",
-        "description": "The opacity of the source",
-        "default": 1,
-        "multipleOf": 0.1,
-        "minimum": 0,
-        "maximum": 1
-      },
-      "radius": {
-        "type": "number",
-        "description": "Radius size in pixels",
-        "default": 8
-      },
-      "blur": {
-        "type": "number",
-        "description": "Blur size in pixels",
-        "default": 15
-      },
-      "color": {
-        "type": "array",
-        "description": "DEPRECATED. Legacy gradient cache. New files should not set this; symbologyState.gradient is the source of truth. Retained only so that legacy .jGIS files can be migrated on load.",
-        "items": {
-          "type": "string"
-        },
-        "default": [
-          "#00f",
-          "#0ff",
-          "#0f0",
-          "#ff0",
-          "#f00"
-        ]
-      },
-      "symbologyState": {
-        "type": "object",
-        "description": "The symbology configuration. Source of truth for how the heatmap is rendered.",
-        "required": [
-          "renderType"
-        ],
-        "properties": {
-          "renderType": {
-            "type": "string",
-            "default": "Heatmap"
-          },
-          "colorRamp": {
-            "type": "string",
-            "default": "viridis"
-          },
-          "gradient": {
-            "type": "array",
-            "description": "Ordered list of CSS color strings used to build the heatmap gradient.",
-            "items": {
-              "type": "string"
-            }
-          }
-        },
-        "default": {}
-      }
-    }
-  },
   "HillshadeLayer": {
     "type": "object",
     "required": [

package/lib/_interface/project/jgis.d.ts

@@ -16,7 +16,6 @@ export type LayerType =
   | "HillshadeLayer"
   | "GeoTiffLayer"
   | "ImageLayer"
-  | "HeatmapLayer"
   | "StacLayer"
   | "StorySegmentLayer"
   | "OpenEOTileLayer";

package/lib/doc.d.ts

@@ -10,7 +10,7 @@ export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> imple
     constructor();
     get initialSyncReady(): Promise<void>;
     private _onOptionsObserverFired;
-    getSource(): JSONObject;
+    getSource(): string;
     setSource(value: JSONObject | string): void;
     dispose(): void;
     get version(): string;

package/lib/doc.js

@@ -101,7 +101,7 @@ export class JupyterGISDoc extends YDocument {
         const stories = this._stories.toJSON();
         const viewState = this._viewState.toJSON();
         const metadata = this._metadata.toJSON();
-        return {
+        return JSON.stringify({
             layers,
             layerTree,
             sources,
@@ -109,7 +109,7 @@ export class JupyterGISDoc extends YDocument {
             viewState,
             options,
             metadata,
-        };
+        }, null, '  ');
     }
     setSource(value) {
         if (!value) {

package/lib/interfaces.d.ts

@@ -10,7 +10,7 @@ import { ISignal, Signal } from '@lumino/signaling';
 import { SplitPanel } from '@lumino/widgets';
 import { FeatureLike } from 'ol/Feature';
 import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerItem, IJGISLayers, IJGISLayerTree, IJGISOptions, IJGISSource, IJGISSources, IJGISStoryMap, IJGISViewState, LayerType, SourceType } from './_interface/project/jgis';
-import { IGeoJSONSource, IGeoParquetSource, IGeoTiffSource, IHeatmapLayer, IHillshadeLayer, IImageLayer, IImageSource, IMarkerSource, IRasterDemSource, IRasterLayer, IRasterSource, IOpenEOTileLayer, IOpenEOTileSource, IShapefileSource, IStacLayer, IStorySegmentLayer, IVectorLayer, IVectorTileLayer, IVectorTileSource, IVideoSource, IGeoTiffLayer, Modes } from './types';
+import { IGeoJSONSource, IGeoParquetSource, IGeoTiffSource, IHillshadeLayer, IImageLayer, IImageSource, IMarkerSource, IRasterDemSource, IRasterLayer, IRasterSource, IOpenEOTileLayer, IOpenEOTileSource, IShapefileSource, IStacLayer, IStorySegmentLayer, IVectorLayer, IVectorTileLayer, IVectorTileSource, IVideoSource, IGeoTiffLayer, Modes } from './types';
 export type { IGeoJSONSource } from './_interface/project/sources/geoJsonSource';
 export interface IJGISUIState {
     leftPanelOpen?: boolean;
@@ -138,7 +138,7 @@ export interface IJupyterGISDoc extends YDocument<IJupyterGISDocChange> {
     metadata: any;
     readonly editable: boolean;
     readonly toJGISEndpoint?: string;
-    getSource(): JSONObject;
+    getSource(): string;
     setSource(value: JSONObject | string): void;
     layerExists(id: string): boolean;
     getLayer(id: string): IJGISLayer | undefined;
@@ -370,7 +370,7 @@ export type ILayerGalleryEntry = {
     name: string;
     thumbnail: string;
     layerType: LayerType;
-    layerParameters: IHeatmapLayer | IHillshadeLayer | IImageLayer | IRasterLayer | IStacLayer | IStorySegmentLayer | IVectorLayer | IVectorTileLayer | IGeoTiffLayer | IOpenEOTileLayer;
+    layerParameters: IHillshadeLayer | IImageLayer | IRasterLayer | IStacLayer | IStorySegmentLayer | IVectorLayer | IVectorTileLayer | IGeoTiffLayer | IOpenEOTileLayer;
     sourceType: SourceType;
     sourceParameters: IGeoJSONSource | IGeoParquetSource | IGeoTiffSource | IImageSource | IMarkerSource | IRasterDemSource | IRasterSource | IShapefileSource | IVectorTileSource | IVideoSource | IOpenEOTileSource;
     provider: string;

package/lib/processing/_generated/exportProcessingSchema.d.ts

@@ -1,10 +1,10 @@
-export * from '../../_interface/processing/clipRasterByExtent';
+export * from '../../_interface/processing/concaveHull';
 export * from '../../_interface/processing/centroids';
-export * from '../../_interface/processing/dissolve';
-export * from '../../_interface/processing/rasterize';
+export * from '../../_interface/processing/clipRasterByVector';
+export * from '../../_interface/processing/boundingBoxes';
+export * from '../../_interface/processing/convexHull';
 export * from '../../_interface/processing/clipVectorByMaskLayer';
-export * from '../../_interface/processing/concaveHull';
+export * from '../../_interface/processing/clipRasterByExtent';
+export * from '../../_interface/processing/rasterize';
 export * from '../../_interface/processing/buffer';
-export * from '../../_interface/processing/convexHull';
-export * from '../../_interface/processing/boundingBoxes';
-export * from '../../_interface/processing/clipRasterByVector';
+export * from '../../_interface/processing/dissolve';

package/lib/processing/_generated/exportProcessingSchema.js

@@ -1,11 +1,11 @@
 //Generated automatically please don't modify directly
-export * from '../../_interface/processing/clipRasterByExtent';
+export * from '../../_interface/processing/concaveHull';
 export * from '../../_interface/processing/centroids';
-export * from '../../_interface/processing/dissolve';
-export * from '../../_interface/processing/rasterize';
+export * from '../../_interface/processing/clipRasterByVector';
+export * from '../../_interface/processing/boundingBoxes';
+export * from '../../_interface/processing/convexHull';
 export * from '../../_interface/processing/clipVectorByMaskLayer';
-export * from '../../_interface/processing/concaveHull';
+export * from '../../_interface/processing/clipRasterByExtent';
+export * from '../../_interface/processing/rasterize';
 export * from '../../_interface/processing/buffer';
-export * from '../../_interface/processing/convexHull';
-export * from '../../_interface/processing/boundingBoxes';
-export * from '../../_interface/processing/clipRasterByVector';
+export * from '../../_interface/processing/dissolve';

package/lib/processing/_generated/processingType.d.ts

@@ -1,2 +1,2 @@
-export type ProcessingType = 'ClipRasterByExtent' | 'Centroids' | 'Dissolve' | 'Rasterize' | 'ClipVectorByMaskLayer' | 'ConcaveHull' | 'Buffer' | 'ConvexHull' | 'BoundingBoxes' | 'ClipRasterByVector';
+export type ProcessingType = 'ConcaveHull' | 'Centroids' | 'ClipRasterByVector' | 'BoundingBoxes' | 'ConvexHull' | 'ClipVectorByMaskLayer' | 'ClipRasterByExtent' | 'Rasterize' | 'Buffer' | 'Dissolve';
 export declare const processingList: string[];

package/lib/processing/_generated/processingType.js

@@ -1,12 +1,12 @@
 export const processingList = [
-    'ClipRasterByExtent',
+    'ConcaveHull',
     'Centroids',
-    'Dissolve',
-    'Rasterize',
+    'ClipRasterByVector',
+    'BoundingBoxes',
+    'ConvexHull',
     'ClipVectorByMaskLayer',
-    'ConcaveHull',
+    'ClipRasterByExtent',
+    'Rasterize',
     'Buffer',
-    'ConvexHull',
-    'BoundingBoxes',
-    'ClipRasterByVector',
+    'Dissolve',
 ];

package/lib/processing/_generated/processing_merge.json

@@ -1,18 +1,17 @@
 [
     {
-        "description": "ClipRasterByExtent",
-        "name": "clipRasterByExtent",
-        "label": "Clip Raster by Extent",
+        "description": "ConcaveHull",
+        "name": "concaveHull",
         "operationParams": [
-            "xMin",
-            "yMin",
-            "xMax",
-            "yMax"
+            "pctconvex",
+            "allowHoles"
         ],
+        "label": "Concave Hull",
         "operations": {
-            "gdalFunction": "gdal_translate"
+            "sql": "SELECT ST_ConcaveHull(geometry,{pctconvex},{allowHoles}) AS geometry, * FROM \"{layerName}\"",
+            "gdalFunction": "ogr2ogr"
         },
-        "type": "rasterClip"
+        "type": "vector"
     },
     {
         "description": "Centroids",
@@ -26,32 +25,39 @@
         "type": "vector"
     },
     {
-        "description": "Dissolve",
-        "name": "dissolve",
+        "description": "ClipRasterByVector",
+        "name": "clipRasterByVector",
+        "label": "Clip Raster by Vector",
         "operationParams": [
-            "dissolveField"
+            "clipLayer",
+            "cropToCutline"
         ],
-        "label": "Dissolve",
         "operations": {
-            "gdalFunction": "ogr2ogr",
-            "sql": "SELECT ST_Union(geometry) AS geometry, {dissolveField} FROM \"{layerName}\" GROUP BY {dissolveField}"
+            "gdalFunction": "gdalwarp"
+        },
+        "type": "rasterClipVector"
+    },
+    {
+        "description": "BoundingBoxes",
+        "name": "boundingBoxes",
+        "operationParams": [],
+        "label": "Bounding Boxes",
+        "operations": {
+            "sql": "SELECT ST_Envelope(geometry) AS geometry, * FROM \"{layerName}\"",
+            "gdalFunction": "ogr2ogr"
         },
         "type": "vector"
     },
     {
-        "description": "Rasterize",
-        "name": "rasterize",
-        "label": "Rasterize",
-        "operationParams": [
-            "pixelSize",
-            "attributeField",
-            "burnValue",
-            "noDataValue"
-        ],
+        "description": "ConvexHull",
+        "name": "convexHull",
+        "operationParams": [],
+        "label": "Convex Hull",
         "operations": {
-            "gdalFunction": "gdal_rasterize"
+            "sql": "SELECT ST_ConvexHull(geometry) AS geometry, * FROM \"{layerName}\"",
+            "gdalFunction": "ogr2ogr"
         },
-        "type": "raster"
+        "type": "vector"
     },
     {
         "description": "ClipVectorByMaskLayer",
@@ -66,18 +72,34 @@
         "type": "clip"
     },
     {
-        "description": "ConcaveHull",
-        "name": "concaveHull",
+        "description": "ClipRasterByExtent",
+        "name": "clipRasterByExtent",
+        "label": "Clip Raster by Extent",
         "operationParams": [
-            "pctconvex",
-            "allowHoles"
+            "xMin",
+            "yMin",
+            "xMax",
+            "yMax"
         ],
-        "label": "Concave Hull",
         "operations": {
-            "sql": "SELECT ST_ConcaveHull(geometry,{pctconvex},{allowHoles}) AS geometry, * FROM \"{layerName}\"",
-            "gdalFunction": "ogr2ogr"
+            "gdalFunction": "gdal_translate"
         },
-        "type": "vector"
+        "type": "rasterClip"
+    },
+    {
+        "description": "Rasterize",
+        "name": "rasterize",
+        "label": "Rasterize",
+        "operationParams": [
+            "pixelSize",
+            "attributeField",
+            "burnValue",
+            "noDataValue"
+        ],
+        "operations": {
+            "gdalFunction": "gdal_rasterize"
+        },
+        "type": "raster"
     },
     {
         "description": "Buffer",
@@ -93,38 +115,16 @@
         "type": "vector"
     },
     {
-        "description": "ConvexHull",
-        "name": "convexHull",
-        "operationParams": [],
-        "label": "Convex Hull",
-        "operations": {
-            "sql": "SELECT ST_ConvexHull(geometry) AS geometry, * FROM \"{layerName}\"",
-            "gdalFunction": "ogr2ogr"
-        },
-        "type": "vector"
-    },
-    {
-        "description": "BoundingBoxes",
-        "name": "boundingBoxes",
-        "operationParams": [],
-        "label": "Bounding Boxes",
-        "operations": {
-            "sql": "SELECT ST_Envelope(geometry) AS geometry, * FROM \"{layerName}\"",
-            "gdalFunction": "ogr2ogr"
-        },
-        "type": "vector"
-    },
-    {
-        "description": "ClipRasterByVector",
-        "name": "clipRasterByVector",
-        "label": "Clip Raster by Vector",
+        "description": "Dissolve",
+        "name": "dissolve",
         "operationParams": [
-            "clipLayer",
-            "cropToCutline"
+            "dissolveField"
         ],
+        "label": "Dissolve",
         "operations": {
-            "gdalFunction": "gdalwarp"
+            "gdalFunction": "ogr2ogr",
+            "sql": "SELECT ST_Union(geometry) AS geometry, {dissolveField} FROM \"{layerName}\" GROUP BY {dissolveField}"
         },
-        "type": "rasterClipVector"
+        "type": "vector"
     }
 ]

package/lib/schema/project/jgis.json

@@ -46,7 +46,6 @@
                 "HillshadeLayer",
                 "GeoTiffLayer",
                 "ImageLayer",
-                "HeatmapLayer",
                 "StacLayer",
                 "StorySegmentLayer",
                 "OpenEOTileLayer"

package/lib/types.d.ts

@@ -13,7 +13,6 @@ export * from './_interface/project/sources/geoParquetSource';
 export * from './_interface/project/sources/markerSource';
 export * from './_interface/project/sources/wmsTileSource';
 export * from './_interface/project/sources/openeoTileSource';
-export * from './_interface/project/layers/heatmapLayer';
 export * from './_interface/project/layers/hillshadeLayer';
 export * from './_interface/project/layers/storySegmentLayer';
 export * from './_interface/project/layers/rasterLayer';
@@ -29,7 +28,7 @@ import type { IGrammarLayer } from './_interface/project/symbology';
 export interface IGrammarSymbologyState {
     /**
      * Ordered list of independent rendering layers sharing the same source.
-     * Each layer produces one renderer layer (VectorLayer, HeatmapLayer, etc.).
+     * Each layer produces one renderer layer (Vector, Image, WebGLTile, etc.).
      * Layers are rendered in order (first = bottom).
      */
     layers: IGrammarLayer[];

package/lib/types.js

@@ -15,7 +15,6 @@ export * from './_interface/project/sources/markerSource';
 export * from './_interface/project/sources/wmsTileSource';
 export * from './_interface/project/sources/openeoTileSource';
 // Layers
-export * from './_interface/project/layers/heatmapLayer';
 export * from './_interface/project/layers/hillshadeLayer';
 export * from './_interface/project/layers/storySegmentLayer';
 export * from './_interface/project/layers/rasterLayer';

package/package.json

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

package/lib/_interface/project/layers/heatmapLayer.d.ts

@@ -1,44 +0,0 @@
-/* tslint:disable */
-/**
- * This file was automatically generated by json-schema-to-typescript.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and run json-schema-to-typescript to regenerate this file.
- */
-
-/**
- * HeatmapLayer
- */
-export interface IHeatmapLayer {
-  /**
-   * The id of the source
-   */
-  source: string;
-  /**
-   * The opacity of the source
-   */
-  opacity?: number;
-  /**
-   * Radius size in pixels
-   */
-  radius: number;
-  /**
-   * Blur size in pixels
-   */
-  blur: number;
-  /**
-   * DEPRECATED. Legacy gradient cache. New files should not set this; symbologyState.gradient is the source of truth. Retained only so that legacy .jGIS files can be migrated on load.
-   */
-  color?: string[];
-  /**
-   * The symbology configuration. Source of truth for how the heatmap is rendered.
-   */
-  symbologyState?: {
-    renderType: string;
-    colorRamp?: string;
-    /**
-     * Ordered list of CSS color strings used to build the heatmap gradient.
-     */
-    gradient?: string[];
-    [k: string]: any;
-  };
-}

package/lib/schema/project/layers/heatmapLayer.json

@@ -1,60 +0,0 @@
-{
-    "type": "object",
-    "description": "HeatmapLayer",
-    "title": "IHeatmapLayer",
-    "required": ["source", "blur", "radius"],
-    "additionalProperties": false,
-    "properties": {
-        "source": {
-            "type": "string",
-            "description": "The id of the source"
-        },
-        "opacity": {
-            "type": "number",
-            "description": "The opacity of the source",
-            "default": 1,
-            "multipleOf": 0.1,
-            "minimum": 0,
-            "maximum": 1
-        },
-        "radius": {
-            "type": "number",
-            "description": "Radius size in pixels",
-            "default": 8
-        },
-        "blur": {
-            "type": "number",
-            "description": "Blur size in pixels",
-            "default": 15
-        },
-        "color": {
-            "type": "array",
-            "description": "DEPRECATED. Legacy gradient cache. New files should not set this; symbologyState.gradient is the source of truth. Retained only so that legacy .jGIS files can be migrated on load.",
-            "items": {
-                "type": "string"
-            },
-            "default": ["#00f", "#0ff", "#0f0", "#ff0", "#f00"]
-        },
-        "symbologyState": {
-            "type": "object",
-            "description": "The symbology configuration. Source of truth for how the heatmap is rendered.",
-            "required": ["renderType"],
-            "properties": {
-                "renderType": {
-                    "type": "string",
-                    "default": "Heatmap"
-                },
-                "colorRamp": {
-                    "type": "string",
-                    "default": "viridis"
-                },
-                "gradient": {
-                    "type": "array",
-                    "description": "Ordered list of CSS color strings used to build the heatmap gradient.",
-                    "items": { "type": "string" }
-                }
-            },
-            "default": {}
-        }
-    }
-}