Skip to content
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

QSM AGB option & download dataset btn #488

Merged
merged 1 commit into from
Feb 6, 2025
Merged

QSM AGB option & download dataset btn #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 62 additions & 24 deletions app/javascript/projects/modelling/components/kew_trees_component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,82 +12,94 @@ interface KewTreeOption {
id: number
name: string
socket: Socket
fn: (broad_crowns: any, conif_crowns: any, projectProps: ProjectProperties, mask: BooleanTileGrid) => any
fn: (broad_crowns: any, conif_crowns: any, QSM: any, projectProps: ProjectProperties, mask: BooleanTileGrid) => any
}

const kewTreeOptions : KewTreeOption[] = [
{
id: 0,
name: 'Deciduous',
socket: booleanDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyBooleanData(broad_crowns, conif_crowns, projectProps, "Deciduous", mask)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyBooleanData(broad_crowns, conif_crowns, QSM, projectProps, "Deciduous", mask)
},
{
id: 1,
name: 'Coniferous',
socket: booleanDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyBooleanData(broad_crowns, conif_crowns, projectProps, "Coniferous", mask)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyBooleanData(broad_crowns, conif_crowns, QSM, projectProps, "Coniferous", mask)
},
{
id: 2,
name: 'Jucker AGB - distributed',
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "jckr_gb", mask, true)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "jckr_gb", mask, true)
},
{
id: 3,
name: 'Wakehurst AGB - distributed',
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "wake_gb", mask, true)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "wake_gb", mask, true)
},
{
id: 4,
name: 'Jucker AGB',
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "jckr_gb", mask, false)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "jckr_gb", mask, false)
},
{
id: 5,
name: 'Wakehurst AGB',
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "jckr_gb", mask, false)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "jckr_gb", mask, false)
},
{
id: 6,
name: "Canopy Diameter",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "canpy_d", mask, false)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "canpy_d", mask, false)
},
{
id: 7,
name: "Height",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "height", mask, false)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "height", mask, false)
},
{
id: 8,
name: "p25",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "p25", mask, false)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "p25", mask, false)
},
{
id: 9,
name: "p25 - distributed",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "p25", mask, true)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "p25", mask, true)
},
{
id: 10,
name: "p75",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "p75", mask, false)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "p75", mask, false)
},
{
id: 11,
name: "p75 - distributed",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, projectProps, "p75", mask, true)
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "p75", mask, true)
},
{
id: 12,
name: "QSM",
socket: booleanDataSocket,
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyBooleanData(broad_crowns, conif_crowns, QSM, projectProps, "QSM", mask)
},
{
id: 13,
name: "QSM - AGB_qsm - distributed",
socket: numericDataSocket,
fn: (broad_crowns, conif_crowns, QSM, projectProps, mask) => applyNumericData(broad_crowns, conif_crowns, QSM, projectProps, "agb_qsm", mask, true)
}


]
Expand All @@ -96,14 +108,33 @@ async function getCrownData(projectProps: ProjectProperties) {

const Deciduous = await retrieveWFSData("kew:bl_crown", projectProps)
const Coniferous = await retrieveWFSData("kew:conifer_crown", projectProps)
const QSM = await retrieveWFSData("kew:QSM_canopy1", projectProps)


return [Deciduous, Coniferous]
return [Deciduous, Coniferous, QSM]
}

function applyBooleanData(broad_crowns: any, conif_crowns: any, projectProps: ProjectProperties, type: "Deciduous" | "Coniferous", mask: BooleanTileGrid) {
function applyBooleanData(broad_crowns: any, conif_crowns: any, QSM: any, projectProps: ProjectProperties, type: "Deciduous" | "Coniferous" | "QSM", mask: BooleanTileGrid) {


const crowns = type === "Deciduous" ? broad_crowns : conif_crowns
let crowns
let subMask: undefined | BooleanTileGrid = undefined

switch (type) {
case "Deciduous":
crowns = broad_crowns
break
case "Coniferous":
crowns = conif_crowns
break
case "QSM":
crowns = QSM
subMask = applyBooleanData(broad_crowns, conif_crowns, QSM, projectProps, "Deciduous", mask)
subMask.merge(applyBooleanData(broad_crowns, conif_crowns, QSM, projectProps, "Coniferous", mask))
break

}
//const crowns = type === "Deciduous" ? broad_crowns : conif_crowns

const tileGrid = createXYZ()
const outputTileRange = tileGrid.getTileRangeForExtentAndZ(projectProps.extent, projectProps.zoom)
Expand All @@ -119,7 +150,7 @@ function applyBooleanData(broad_crowns: any, conif_crowns: any, projectProps: Pr
)

grid.iterateOverTileRange(featureTileRange, (x, y) => {
grid.set(x, y, grid.get(x, y) || (geom.intersectsCoordinate(tileGrid.getTileCoordCenter([projectProps.zoom, x, y])) && mask.get(x, y)))
grid.set(x, y, grid.get(x, y) || (geom.intersectsCoordinate(tileGrid.getTileCoordCenter([projectProps.zoom, x, y])) && mask.get(x, y) && (subMask === undefined || subMask.get(x, y))))
})

})
Expand All @@ -129,9 +160,15 @@ function applyBooleanData(broad_crowns: any, conif_crowns: any, projectProps: Pr
return grid
}

function applyNumericData(broad_crowns: any, conif_crowns: any, projectProps: ProjectProperties, type: "jckr_gb" | "wake_gb" | "height" | "canpy_d" | "p25" | "p75", mask: BooleanTileGrid, distribute: boolean) {
function applyNumericData(broad_crowns: any, conif_crowns: any, QSM: any, projectProps: ProjectProperties, type: "jckr_gb" | "wake_gb" | "height" | "canpy_d" | "p25" | "p75" | "agb_qsm", mask: BooleanTileGrid, distribute: boolean) {

const crowns = [...broad_crowns, ...conif_crowns]
const crowns = type === "agb_qsm" ? QSM : [...broad_crowns, ...conif_crowns]

let subMask: undefined | BooleanTileGrid = undefined

if(type === "agb_qsm"){
subMask = applyBooleanData(broad_crowns, conif_crowns, QSM, projectProps, "QSM", mask)
}

const tileGrid = createXYZ()
const outputTileRange = tileGrid.getTileRangeForExtentAndZ(projectProps.extent, projectProps.zoom)
Expand All @@ -153,7 +190,7 @@ function applyNumericData(broad_crowns: any, conif_crowns: any, projectProps: Pr
let n = 0
// count number of tiles intersected
grid.iterateOverTileRange(featureTileRange, (x, y) => {
if(geom.intersectsCoordinate(tileGrid.getTileCoordCenter([projectProps.zoom, x, y])) && mask.get(x, y)) n++
if(geom.intersectsCoordinate(tileGrid.getTileCoordCenter([projectProps.zoom, x, y])) && mask.get(x, y) && (subMask === undefined || subMask.get(x, y))) n++
})
// distribute value over tiles
val = n > 0 ? value / n : NaN
Expand All @@ -162,7 +199,7 @@ function applyNumericData(broad_crowns: any, conif_crowns: any, projectProps: Pr
}

grid.iterateOverTileRange(featureTileRange, (x, y) => {
if (geom.intersectsCoordinate(tileGrid.getTileCoordCenter([projectProps.zoom, x, y])) && mask.get(x, y)){
if (geom.intersectsCoordinate(tileGrid.getTileCoordCenter([projectProps.zoom, x, y])) && mask.get(x, y) && (subMask === undefined || subMask.get(x, y))){

const v = grid.get(x, y)
grid.set(x, y, v ? v + val : val)
Expand All @@ -179,6 +216,7 @@ export class KewTreesComponent extends BaseComponent {
projectProps: ProjectProperties
broadCrowns: any
conifCrowns: any
QSM: any

constructor(projectProps : ProjectProperties) {
super("Wakehurst Trees")
Expand All @@ -193,8 +231,8 @@ export class KewTreesComponent extends BaseComponent {
}

async worker(node: NodeData, inputs: WorkerInputs, outputs: WorkerOutputs, ...args: unknown[]) {
if (this.broadCrowns === undefined || this.conifCrowns === undefined) {
[this.broadCrowns, this.conifCrowns] = await getCrownData(this.projectProps)
if (this.broadCrowns === undefined || this.conifCrowns === undefined || this.QSM === undefined) {
[this.broadCrowns, this.conifCrowns, this.QSM] = await getCrownData(this.projectProps)
}


Expand All @@ -203,7 +241,7 @@ export class KewTreesComponent extends BaseComponent {
const mask = await maskFromExtentAndShape(this.projectProps.extent, this.projectProps.zoom, this.projectProps.maskLayer, this.projectProps.maskCQL, this.projectProps.mask)

kewTreeOptions.filter(opt => node.outputs[opt.name].connections.length > 0).forEach(option => {
outputs[option.name] = option.fn(this.broadCrowns, this.conifCrowns, this.projectProps, mask)
outputs[option.name] = option.fn(this.broadCrowns, this.conifCrowns, this.QSM, this.projectProps, mask)
})

}
Expand Down
9 changes: 9 additions & 0 deletions app/javascript/projects/modelling/tile_grid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@ export class BooleanTileGrid extends TileGrid {
}
}

merge(other: BooleanTileGrid) {
const { x, y, width, height } = this
for (let i = x; i < x + width; i++) {
for (let j = y; j < y + height; j++) {
this.set(i, j, this.get(i, j) || other.get(i, j))
}
}
}

iterate(callback: (x: number, y: number, value: boolean) => void) {
const { x, y, width, height } = this
for (let i = x; i < x + width; i++) {
Expand Down
3 changes: 3 additions & 0 deletions app/views/datasets/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
</span>
</div>
<div>
<%= link_to dataset_path(dataset, team_id: @team.id), class: "px-3 py-2" do %>
<i class="fas fa-download"></i>
<% end %>
<%= link_to edit_dataset_path(dataset), class: "px-3 py-2" do %>
<i class="fas fa-edit"></i>
<% end %>
Expand Down