@jupytergis/schema 0.14.1 → 0.15.0

package/lib/_interface/forms.json

@@ -461,7 +461,8 @@
             "enum": [
               "Single Symbol",
               "Graduated",
-              "Categorized"
+              "Categorized",
+              "Canonical"
             ],
             "default": "Single Symbol"
           },
@@ -498,6 +499,28 @@
               "pretty",
               "logarithmic"
             ]
+          },
+          "vmin": {
+            "type": "number",
+            "description": "Minimum value for color mapping"
+          },
+          "vmax": {
+            "type": "number",
+            "description": "Maximum value for color mapping"
+          },
+          "fallbackColor": {
+            "type": "array",
+            "description": "RGBA fallback color for features with no matching category or outside the gradient range",
+            "items": {
+              "type": "number"
+            },
+            "minItems": 4,
+            "maxItems": 4
+          },
+          "strokeFollowsFill": {
+            "type": "boolean",
+            "description": "Whether the stroke color follows the fill color expression",
+            "default": false
           }
         },
         "additionalProperties": false,
@@ -547,7 +570,8 @@
             "enum": [
               "Single Symbol",
               "Graduated",
-              "Categorized"
+              "Categorized",
+              "Canonical"
             ],
             "default": "Single Symbol"
           },
@@ -581,6 +605,28 @@
               "pretty",
               "logarithmic"
             ]
+          },
+          "vmin": {
+            "type": "number",
+            "description": "Minimum value for color mapping"
+          },
+          "vmax": {
+            "type": "number",
+            "description": "Maximum value for color mapping"
+          },
+          "fallbackColor": {
+            "type": "array",
+            "description": "RGBA fallback color for features with no matching category or outside the gradient range",
+            "items": {
+              "type": "number"
+            },
+            "minItems": 4,
+            "maxItems": 4
+          },
+          "strokeFollowsFill": {
+            "type": "boolean",
+            "description": "Whether the stroke color follows the fill color expression",
+            "default": false
           }
         },
         "additionalProperties": false,
@@ -1107,6 +1153,44 @@
       }
     }
   },
+  "WmsTileSource": {
+    "type": "object",
+    "required": [
+      "url",
+      "params"
+    ],
+    "additionalProperties": false,
+    "properties": {
+      "url": {
+        "type": "string",
+        "description": "The url to the tile provider"
+      },
+      "params": {
+        "type": "object",
+        "title": "Params for URL query",
+        "required": [
+          "layers"
+        ],
+        "properties": {
+          "layers": {
+            "type": "string",
+            "description": "WMS layer name to request"
+          }
+        }
+      },
+      "attribution": {
+        "type": "string",
+        "readOnly": true,
+        "description": "The attribution for the raster source",
+        "default": ""
+      },
+      "interpolate": {
+        "type": "boolean",
+        "description": "Interpolate between grid cells when overzooming?",
+        "default": false
+      }
+    }
+  },
   "GeoJSONSource": {
     "type": "object",
     "required": [],

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

@@ -25,6 +25,7 @@ export type LayerType =
  */
 export type SourceType =
   | "RasterSource"
+  | "WmsTileSource"
   | "VectorTileSource"
   | "GeoJSONSource"
   | "RasterDemSource"

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

@@ -27,12 +27,28 @@ export interface IVectorLayer {
    * The state of the symbology panel options
    */
   symbologyState?: {
-    renderType: "Single Symbol" | "Graduated" | "Categorized";
+    renderType: "Single Symbol" | "Graduated" | "Categorized" | "Canonical";
     value?: string;
     method?: "color" | "radius";
     colorRamp?: string;
     nClasses?: number;
     reverse?: boolean;
     mode?: "quantile" | "equal interval" | "jenks" | "pretty" | "logarithmic";
+    /**
+     * Minimum value for color mapping
+     */
+    vmin?: number;
+    /**
+     * Maximum value for color mapping
+     */
+    vmax?: number;
+    /**
+     * RGBA fallback color for features with no matching category or outside the gradient range
+     */
+    fallbackColor?: [number, number, number, number];
+    /**
+     * Whether the stroke color follows the fill color expression
+     */
+    strokeFollowsFill?: boolean;
   };
 }

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

@@ -27,11 +27,27 @@ export interface IVectorTileLayer {
    * The state of the symbology panel options
    */
   symbologyState?: {
-    renderType: "Single Symbol" | "Graduated" | "Categorized";
+    renderType: "Single Symbol" | "Graduated" | "Categorized" | "Canonical";
     value?: string;
     method?: "color" | "radius";
     colorRamp?: string;
     nClasses?: string;
     mode?: "quantile" | "equal interval" | "jenks" | "pretty" | "logarithmic";
+    /**
+     * Minimum value for color mapping
+     */
+    vmin?: number;
+    /**
+     * Maximum value for color mapping
+     */
+    vmax?: number;
+    /**
+     * RGBA fallback color for features with no matching category or outside the gradient range
+     */
+    fallbackColor?: [number, number, number, number];
+    /**
+     * Whether the stroke color follows the fill color expression
+     */
+    strokeFollowsFill?: boolean;
   };
 }

package/lib/_interface/project/sources/wmsTileSource.d.ts

@@ -0,0 +1,32 @@
+/* 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.
+ */
+
+/**
+ * WmsTileSource
+ */
+export interface IWmsTileSource {
+  /**
+   * The url to the tile provider
+   */
+  url: string;
+  params: ParamsForURLQuery;
+  /**
+   * The attribution for the raster source
+   */
+  attribution?: string;
+  /**
+   * Interpolate between grid cells when overzooming?
+   */
+  interpolate?: boolean;
+}
+export interface ParamsForURLQuery {
+  /**
+   * WMS layer name to request
+   */
+  layers: string;
+  [k: string]: any;
+}

package/lib/doc.d.ts

@@ -3,6 +3,7 @@ import { JSONObject } from '@lumino/coreutils';
 import { ISignal } from '@lumino/signaling';
 import { IJGISLayer, IJGISLayerItem, IJGISLayerTree, IJGISLayers, IJGISOptions, IJGISSource, IJGISSources, IJGISStoryMap } from './_interface/project/jgis';
 import { IDict, IJGISLayerDocChange, IJGISLayerTreeDocChange, IJGISSourceDocChange, IJGISStoryMapDocChange, IJGISStoryMaps, IJupyterGISDoc, IJupyterGISDocChange } from './interfaces';
+export declare const DEFAULT_PROJECTION = "EPSG:3857";
 /** Default JSON content for a new JupyterGIS document. */
 export declare const DEFAULT_JGIS_DOCUMENT_CONTENT = "{\n\t\"schemaVersion\": \"0.5.0\",\n\t\"layers\": {},\n\t\"sources\": {},\n\t\"options\": {\"latitude\": 0, \"longitude\": 0, \"zoom\": 0, \"bearing\": 0, \"pitch\": 0, \"projection\": \"EPSG:3857\", \"storyMapPresentationMode\": false},\n\t\"layerTree\": [],\n\t\"metadata\": {}\n}";
 export declare class JupyterGISDoc extends YDocument<IJupyterGISDocChange> implements IJupyterGISDoc {

package/lib/doc.js

@@ -2,12 +2,13 @@ import { YDocument } from '@jupyter/ydoc';
 import { JSONExt } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import { SCHEMA_VERSION } from './_interface/version';
+export const DEFAULT_PROJECTION = 'EPSG:3857';
 /** Default JSON content for a new JupyterGIS document. */
 export const DEFAULT_JGIS_DOCUMENT_CONTENT = `{
 	"schemaVersion": "${SCHEMA_VERSION}",
 	"layers": {},
 	"sources": {},
-	"options": {"latitude": 0, "longitude": 0, "zoom": 0, "bearing": 0, "pitch": 0, "projection": "EPSG:3857", "storyMapPresentationMode": false},
+	"options": {"latitude": 0, "longitude": 0, "zoom": 0, "bearing": 0, "pitch": 0, "projection": "${DEFAULT_PROJECTION}", "storyMapPresentationMode": false},
 	"layerTree": [],
 	"metadata": {}
 }`;

package/lib/model.js

@@ -1,7 +1,7 @@
 import { UUID } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import Ajv from 'ajv';
-import { JupyterGISDoc } from './doc';
+import { DEFAULT_PROJECTION, JupyterGISDoc } from './doc';
 import jgisSchema from './schema/project/jgis.json';
 const SETTINGS_ID = '@jupytergis/jupytergis-core:jupytergis-settings';
 const DEFAULT_SETTINGS = {
@@ -274,7 +274,7 @@ export class JupyterGISModel {
                 zoom: 0,
                 bearing: 0,
                 pitch: 0,
-                projection: 'EPSG:3857',
+                projection: DEFAULT_PROJECTION,
             };
             this.sharedModel.metadata = (_f = jsonData.metadata) !== null && _f !== void 0 ? _f : {};
         });

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

@@ -1,6 +1,6 @@
+export * from '../../_interface/processing/boundingBoxes';
+export * from '../../_interface/processing/concaveHull';
+export * from '../../_interface/processing/dissolve';
 export * from '../../_interface/processing/buffer';
 export * from '../../_interface/processing/convexHull';
-export * from '../../_interface/processing/dissolve';
-export * from '../../_interface/processing/concaveHull';
-export * from '../../_interface/processing/boundingBoxes';
 export * from '../../_interface/processing/centroids';

package/lib/processing/_generated/exportProcessingSchema.js

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

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

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

package/lib/processing/_generated/processingType.js

@@ -1,8 +1,8 @@
 export const processingList = [
+    'BoundingBoxes',
+    'ConcaveHull',
+    'Dissolve',
     'Buffer',
     'ConvexHull',
-    'Dissolve',
-    'ConcaveHull',
-    'BoundingBoxes',
     'Centroids',
 ];

package/lib/processing/_generated/processing_merge.json

@@ -1,24 +1,25 @@
 [
     {
-        "description": "Buffer",
-        "name": "buffer",
-        "label": "Buffer",
-        "operationParams": [
-            "bufferDistance"
-        ],
+        "description": "BoundingBoxes",
+        "name": "boundingBoxes",
+        "operationParams": [],
+        "label": "Bounding Boxes",
         "operations": {
-            "gdalFunction": "ogr2ogr",
-            "sql": "SELECT ST_Union(ST_Buffer(geometry, {bufferDistance})) AS geometry, * FROM \"{layerName}\""
+            "sql": "SELECT ST_Envelope(geometry) AS geometry, * FROM \"{layerName}\"",
+            "gdalFunction": "ogr2ogr"
         },
         "type": "vector"
     },
     {
-        "description": "ConvexHull",
-        "name": "convexHull",
-        "operationParams": [],
-        "label": "Convex Hull",
+        "description": "ConcaveHull",
+        "name": "concaveHull",
+        "operationParams": [
+            "pctconvex",
+            "allowHoles"
+        ],
+        "label": "Concave Hull",
         "operations": {
-            "sql": "SELECT ST_ConvexHull(geometry) AS geometry, * FROM \"{layerName}\"",
+            "sql": "SELECT ST_ConcaveHull(geometry,{pctconvex},{allowHoles}) AS geometry, * FROM \"{layerName}\"",
             "gdalFunction": "ogr2ogr"
         },
         "type": "vector"
@@ -37,26 +38,25 @@
         "type": "vector"
     },
     {
-        "description": "ConcaveHull",
-        "name": "concaveHull",
+        "description": "Buffer",
+        "name": "buffer",
+        "label": "Buffer",
         "operationParams": [
-            "pctconvex",
-            "allowHoles"
+            "bufferDistance"
         ],
-        "label": "Concave Hull",
         "operations": {
-            "sql": "SELECT ST_ConcaveHull(geometry,{pctconvex},{allowHoles}) AS geometry, * FROM \"{layerName}\"",
-            "gdalFunction": "ogr2ogr"
+            "gdalFunction": "ogr2ogr",
+            "sql": "SELECT ST_Union(ST_Buffer(geometry, {bufferDistance})) AS geometry, * FROM \"{layerName}\""
         },
         "type": "vector"
     },
     {
-        "description": "BoundingBoxes",
-        "name": "boundingBoxes",
+        "description": "ConvexHull",
+        "name": "convexHull",
         "operationParams": [],
-        "label": "Bounding Boxes",
+        "label": "Convex Hull",
         "operations": {
-            "sql": "SELECT ST_Envelope(geometry) AS geometry, * FROM \"{layerName}\"",
+            "sql": "SELECT ST_ConvexHull(geometry) AS geometry, * FROM \"{layerName}\"",
             "gdalFunction": "ogr2ogr"
         },
         "type": "vector"

package/lib/schema/project/jgis.json

@@ -52,6 +52,7 @@
             "type": "string",
             "enum": [
                 "RasterSource",
+                "WmsTileSource",
                 "VectorTileSource",
                 "GeoJSONSource",
                 "RasterDemSource",

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

@@ -29,7 +29,7 @@
             "properties": {
                 "renderType": {
                     "type": "string",
-                    "enum": ["Single Symbol", "Graduated", "Categorized"],
+                    "enum": ["Single Symbol", "Graduated", "Categorized", "Canonical"],
                     "default": "Single Symbol"
                 },
                 "value": {
@@ -62,6 +62,26 @@
                         "pretty",
                         "logarithmic"
                     ]
+                },
+                "vmin": {
+                    "type": "number",
+                    "description": "Minimum value for color mapping"
+                },
+                "vmax": {
+                    "type": "number",
+                    "description": "Maximum value for color mapping"
+                },
+                "fallbackColor": {
+                    "type": "array",
+                    "description": "RGBA fallback color for features with no matching category or outside the gradient range",
+                    "items": { "type": "number" },
+                    "minItems": 4,
+                    "maxItems": 4
+                },
+                "strokeFollowsFill": {
+                    "type": "boolean",
+                    "description": "Whether the stroke color follows the fill color expression",
+                    "default": false
                 }
             },
             "additionalProperties": false,

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

@@ -29,7 +29,7 @@
             "properties": {
                 "renderType": {
                     "type": "string",
-                    "enum": ["Single Symbol", "Graduated", "Categorized"],
+                    "enum": ["Single Symbol", "Graduated", "Categorized", "Canonical"],
                     "default": "Single Symbol"
                 },
                 "value": {
@@ -59,6 +59,26 @@
                         "pretty",
                         "logarithmic"
                     ]
+                },
+                "vmin": {
+                    "type": "number",
+                    "description": "Minimum value for color mapping"
+                },
+                "vmax": {
+                    "type": "number",
+                    "description": "Maximum value for color mapping"
+                },
+                "fallbackColor": {
+                    "type": "array",
+                    "description": "RGBA fallback color for features with no matching category or outside the gradient range",
+                    "items": { "type": "number" },
+                    "minItems": 4,
+                    "maxItems": 4
+                },
+                "strokeFollowsFill": {
+                    "type": "boolean",
+                    "description": "Whether the stroke color follows the fill color expression",
+                    "default": false
                 }
             },
             "additionalProperties": false,

package/lib/schema/project/sources/wmsTileSource.json

@@ -0,0 +1,35 @@
+{
+    "type": "object",
+    "description": "WmsTileSource",
+    "title": "IWmsTileSource",
+    "required": ["url", "params"],
+    "additionalProperties": false,
+    "properties": {
+        "url": {
+            "type": "string",
+            "description": "The url to the tile provider"
+        },
+        "params": {
+            "type": "object",
+            "title": "Params for URL query",
+            "required": ["layers"],
+            "properties": {
+                "layers": {
+                    "type": "string",
+                    "description": "WMS layer name to request"
+                }
+            }
+        },
+        "attribution": {
+            "type": "string",
+            "readOnly": true,
+            "description": "The attribution for the raster source",
+            "default": ""
+        },
+        "interpolate": {
+            "type": "boolean",
+            "description": "Interpolate between grid cells when overzooming?",
+            "default": false
+        }
+    }
+}

package/lib/types.d.ts

@@ -9,6 +9,7 @@ export * from './_interface/project/sources/vectorTileSource';
 export * from './_interface/project/sources/videoSource';
 export * from './_interface/project/sources/geoParquetSource';
 export * from './_interface/project/sources/markerSource';
+export * from './_interface/project/sources/wmsTileSource';
 export * from './_interface/project/layers/heatmapLayer';
 export * from './_interface/project/layers/hillshadeLayer';
 export * from './_interface/project/layers/storySegmentLayer';

package/lib/types.js

@@ -10,6 +10,7 @@ export * from './_interface/project/sources/vectorTileSource';
 export * from './_interface/project/sources/videoSource';
 export * from './_interface/project/sources/geoParquetSource';
 export * from './_interface/project/sources/markerSource';
+export * from './_interface/project/sources/wmsTileSource';
 // Layers
 export * from './_interface/project/layers/heatmapLayer';
 export * from './_interface/project/layers/hillshadeLayer';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/schema",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "A JupyterGIS schema package.",
   "keywords": [
     "jupytergis"
@@ -39,6 +39,7 @@
     "clean:all": "jlpm run clean:lib",
     "watch": "tsc -w"
   },
+  "packageManager": "yarn@3.5.0",
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^9.0.9",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",