@jupytergis/schema 0.6.0 → 0.6.2

package/lib/interfaces.d.ts

@@ -9,7 +9,7 @@ import { ISignal, Signal } from '@lumino/signaling';
 import { SplitPanel } from '@lumino/widgets';
 import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerItem, IJGISLayers, IJGISLayerTree, IJGISOptions, IJGISSource, IJGISSources, SourceType } from './_interface/project/jgis';
 import { IRasterSource } from './_interface/project/sources/rasterSource';
-export { IGeoJSONSource } from './_interface/geoJsonSource';
+export { IGeoJSONSource } from './_interface/project/sources/geoJsonSource';
 export type JgisCoordinates = {
     x: number;
     y: number;

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

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

package/lib/processing/_generated/exportProcessingSchema.js

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

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

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

package/lib/processing/_generated/processingType.js

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

package/lib/processing/_generated/processing_merge.json

@@ -13,15 +13,16 @@
         "type": "vector"
     },
     {
-        "description": "Dissolve",
-        "name": "dissolve",
+        "description": "ConcaveHull",
+        "name": "concaveHull",
         "operationParams": [
-            "dissolveField"
+            "pctconvex",
+            "allowHoles"
         ],
-        "label": "Dissolve",
+        "label": "Concave Hull",
         "operations": {
-            "gdalFunction": "ogr2ogr",
-            "sql": "SELECT ST_Union(geometry) AS geometry, {dissolveField} FROM \"{layerName}\" GROUP BY {dissolveField}"
+            "sql": "SELECT ST_ConcaveHull(geometry,{pctconvex},{allowHoles}) AS geometry, * FROM \"{layerName}\"",
+            "gdalFunction": "ogr2ogr"
         },
         "type": "vector"
     },
@@ -48,16 +49,15 @@
         "type": "vector"
     },
     {
-        "description": "ConcaveHull",
-        "name": "concaveHull",
+        "description": "Dissolve",
+        "name": "dissolve",
         "operationParams": [
-            "pctconvex",
-            "allowHoles"
+            "dissolveField"
         ],
-        "label": "Concave Hull",
+        "label": "Dissolve",
         "operations": {
-            "sql": "SELECT ST_ConcaveHull(geometry,{pctconvex},{allowHoles}) AS geometry, * FROM \"{layerName}\"",
-            "gdalFunction": "ogr2ogr"
+            "gdalFunction": "ogr2ogr",
+            "sql": "SELECT ST_Union(geometry) AS geometry, {dissolveField} FROM \"{layerName}\" GROUP BY {dissolveField}"
         },
         "type": "vector"
     },

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 export * from './_interface/project/jgis';
-export * from './_interface/geoJsonSource';
+export * from './_interface/project/sources/geoJsonSource';
 export * from './_interface/project/sources/geoTiffSource';
 export * from './_interface/project/sources/imageSource';
 export * from './_interface/project/sources/rasterDemSource';

package/lib/types.js

@@ -1,6 +1,6 @@
 export * from './_interface/project/jgis';
 // Sources
-export * from './_interface/geoJsonSource';
+export * from './_interface/project/sources/geoJsonSource';
 export * from './_interface/project/sources/geoTiffSource';
 export * from './_interface/project/sources/imageSource';
 export * from './_interface/project/sources/rasterDemSource';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/schema",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "A JupyterGIS schema package.",
   "keywords": [
     "jupytergis"
@@ -26,10 +26,11 @@
   },
   "scripts": {
     "build": "jlpm build:schema && jlpm build:lib",
-    "build:schema": "jlpm run build:processing && node ./cacheGeoJSONSchema.js && jlpm build:schema:js && jlpm build:schema:py",
+    "build:schema": "jlpm run build:processing && node ./cacheGeoJSONSchema.js && jlpm build:schema:registry && jlpm build:schema:js && jlpm build:schema:py",
     "build:processing": "python scripts/process.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_core/jupytergis_core/schema/interfaces --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema",
+    "build:schema:registry": "echo 'Generating combined schema file for schema registry...' && cd src/schema && node ../../scripts/dereference-and-combine-schemas-for-registry.js",
+    "build:schema:js": "echo 'Generating TypeScript types from schema...' && json2ts -i src/schema -o src/_interface --no-unknownAny --unreachableDefinitions --cwd ./src/schema && node ./scripts/add-schema-version.js && cp -R ./src/_interface/* ./lib/_interface/.",
+    "build:schema:py": "echo 'Generating Python types from schema...' && node scripts/preprocess-schemas-for-python-type-generation.js && datamodel-codegen --input ./temp-schema --output ../../python/jupytergis_core/jupytergis_core/schema/interfaces --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema && rm -rf ./temp-schema",
     "build:prod": "jlpm run clean && jlpm build:schema && jlpm run build:lib",
     "build:lib": "tsc -b",
     "build:dev": "jlpm run build",