Skip to content

Fix processing functions #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
Merged

Fix processing functions #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
def366c
Fix processing functions
martinRenou Jul 16, 2025
79035fb
Hard pin proj4
martinRenou Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
"ol-stac": "^1.0.0-rc.10",
"pbf": "^4.0.1",
"pmtiles": "^3.0.7",
"proj4": "^2.19.3",
"proj4-list": "^1.0.4",
"proj4": "2.19.3",
"proj4-list": "1.0.4",
"react": "^18.0.1",
"react-day-picker": "^9.7.0",
"shpjs": "^6.1.0",
Expand All @@ -102,7 +102,7 @@
"@types/colormap": "^2.3.4",
"@types/d3-color": "^3.1.0",
"@types/node": "^18.15.11",
"@types/proj4": "^2.5.6",
"@types/proj4": "2.19.0",
"@types/shpjs": "^3.4.7",
"@types/uuid": "^10.0.0",
"rimraf": "^3.0.2",
Expand Down
8 changes: 5 additions & 3 deletions packages/base/src/processing/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ export async function executeSQLProcessing(
const processedGeoJSONString = new TextDecoder().decode(processedBytes);
Gdal.close(dataset);

const layerName = `${layerNamePrefix} ${processingType.charAt(0).toUpperCase() + processingType.slice(1)}`;

if (!embedOutputLayer) {
// Save the output as a file
const jgisFilePath = tracker.currentWidget?.model.filePath;
Expand Down Expand Up @@ -242,7 +244,7 @@ export async function executeSQLProcessing(
type: 'VectorLayer',
parameters: { source: newSourceId },
visible: true,
name: outputFileName,
name: layerName,
};

model.sharedModel.addSource(newSourceId, sourceModel);
Expand All @@ -254,15 +256,15 @@ export async function executeSQLProcessing(

const sourceModel: IJGISSource = {
type: 'GeoJSONSource',
name: `${layerNamePrefix} ${processingType.charAt(0).toUpperCase() + processingType.slice(1)}`,
name: `${layerName} Source`,
parameters: { data: processedGeoJSON },
};

const layerModel: IJGISLayer = {
type: 'VectorLayer',
parameters: { source: newSourceId },
visible: true,
name: `${layerNamePrefix} ${processingType.charAt(0).toUpperCase() + processingType.slice(1)}`,
name: layerName,
};

model.sharedModel.addSource(newSourceId, sourceModel);
Expand Down
27 changes: 10 additions & 17 deletions packages/schema/scripts/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,22 @@ def defineProcessingType():
file for file in os.listdir(processingSchemaDir) if file.endswith(".json")
]

params = []
for filename in filenamesSchema:
filename = f"{processingSchemaDir}/{filename}"
with open(filename, "r") as f:
e = json.loads(f.read())
schemaFilename = f"{processingSchemaDir}/{filename}"

toAdd = {}
toAdd["description"] = e["description"]
processingParams = {}
with open(schemaFilename, "r") as f:
e = json.loads(f.read())

params.append(toAdd)
processingParams["description"] = e["description"]

filenamesProcessConfig = [
file for file in os.listdir(processingConfigDir) if file.endswith(".json")
]

cnt = 0
for filename in filenamesProcessConfig:
filename = f"{processingConfigDir}/{filename}"
with open(filename, "r") as f:
configName = f"{processingConfigDir}/{filename}"
with open(configName, "r") as f:
e = json.loads(f.read())
for x in e:
params[cnt][x] = e[x]
cnt += 1
processingParams[x] = e[x]

params.append(processingParams)

os.makedirs(directory, exist_ok=True)
generateJsonMerge()
Expand Down
34 changes: 28 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ __metadata:
"@types/colormap": ^2.3.4
"@types/d3-color": ^3.1.0
"@types/node": ^18.15.11
"@types/proj4": ^2.5.6
"@types/proj4": 2.19.0
"@types/shpjs": ^3.4.7
"@types/uuid": ^10.0.0
ajv: ^8.14.0
Expand All @@ -869,8 +869,8 @@ __metadata:
ol-stac: ^1.0.0-rc.10
pbf: ^4.0.1
pmtiles: ^3.0.7
proj4: ^2.19.3
proj4-list: ^1.0.4
proj4: 2.19.3
proj4-list: 1.0.4
react: ^18.0.1
react-day-picker: ^9.7.0
rimraf: ^3.0.2
Expand Down Expand Up @@ -3578,7 +3578,7 @@ __metadata:
languageName: node
linkType: hard

"@types/proj4@npm:^2.5.6":
"@types/proj4@npm:2.19.0":
version: 2.19.0
resolution: "@types/proj4@npm:2.19.0"
dependencies:
Expand Down Expand Up @@ -10064,14 +10064,36 @@ __metadata:
languageName: node
linkType: hard

"proj4-list@npm:^1.0.4":
"proj4-list@npm:1.0.4":
version: 1.0.4
resolution: "proj4-list@npm:1.0.4"
checksum: 3833f61bbbc93684e97555fa11db72009954565ad56313d7dd306ab7c9e4fc480ab64280ae418c0108ee83d0ae0810b334a42dbf8f8f8be4d58371a29a8a35ef
languageName: node
linkType: hard

"proj4@npm:*, proj4@npm:^2.1.4, proj4@npm:^2.19.3":
"proj4@npm:*":
version: 2.19.7
resolution: "proj4@npm:2.19.7"
dependencies:
mgrs: 1.0.0
wkt-parser: ^1.5.1
checksum: fb8a9b0fbc2666fc21fbb6daa39e3a532d39766dd84997091c6bec020d2d97576236c287e8d46ec8d579ff4882ea6b3cf011a0073422d28c092883851c87fe0f
languageName: node
linkType: hard

"proj4@npm:2.19.3":
version: 2.19.3
resolution: "proj4@npm:2.19.3"
dependencies:
mgrs: 1.0.0
wkt-parser: ^1.5.1
peerDependencies:
geotiff: "*"
checksum: 59c9c18fd0dfc48f2b4b5e14e350cf3f366e70f39407bb3a7f27b4da922c4ae75222837f9d61227b0ed2722a8cbb6891027470748eec993e36d2f1d642f1bdf7
languageName: node
linkType: hard

"proj4@npm:^2.1.4":
version: 2.19.6
resolution: "proj4@npm:2.19.6"
dependencies:
Expand Down
Loading