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.

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

ML Layer implementation on Map View #333

Merged
merged 1 commit into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions app/javascript/projects/layer_palette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,18 @@ export const LayerPalette = ({ addLayer, hide, dbModels, getTeamDatasets, teamNa
/>
))}
</Section>
<Section title="Machine Learning Output">
<AddLayerButton
addLayer={addLayer}
prototype={{
type: "MLLayer",
layerName: "ml:tree_hedge_predictions",
name: "Trees & Hedges Classification",
visible: true,
opacity: 1,
}}
/>
</Section>
<Section title="Ancient Tree Inventory">
<AddLayerButton
addLayer={addLayer}
Expand Down
24 changes: 24 additions & 0 deletions app/javascript/projects/reify_layer/geoserver.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import BaseLayer from "ol/layer/Base"
import { MLLayer } from "../state"
import TileLayer from "ol/layer/Tile"
import TileWMS from "ol/source/TileWMS"
import { memoize } from "lodash"



const getSourceWMS = memoize((layer: MLLayer) =>
new TileWMS({
url: 'https://landscapes.wearepal.ai/geoserver/wms',
params: {'LAYERS': layer.layerName, 'TILED': true, 'STYLES': 'ml:treesandhedges'},
serverType: 'geoserver',
imageSmoothing: false
})
)


export function reifyGeoserverWMSLayer (layer: MLLayer, existingLayer: BaseLayer | null) {

return new TileLayer({
source: getSourceWMS(layer)
})
}
2 changes: 2 additions & 0 deletions app/javascript/projects/reify_layer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { reifyCropMapLayer } from './crop_map_layer'
import { reifyAtiLayer } from './ati'
import { reifyShapeFileLayer } from './shapefile'
import { reifyBoundaryLayer } from './boundary'
import { reifyGeoserverWMSLayer } from './geoserver'

export const reifyLayer = (layer: Layer, existingLayer: BaseLayer | null, dbModels: DBModels, map: Map, modelOutputCache: ModelOutputCache, DatasetCache: DatasetCache, loadteamDataset: (layer: DatasetLayer) => void): BaseLayer => {
const layerType = layer.type
Expand All @@ -29,6 +30,7 @@ export const reifyLayer = (layer: Layer, existingLayer: BaseLayer | null, dbMode
case "AtiLayer" : return reifyAtiLayer(layer, existingLayer, map)
case "ShapeLayer": return reifyShapeFileLayer(layer, existingLayer, map)
case "BoundaryLayer": return reifyBoundaryLayer(layer, existingLayer, map)
case "MLLayer": return reifyGeoserverWMSLayer(layer, existingLayer)
default: {
// Ensure this switch statement is exhaustive
const unreachable: never = layerType
Expand Down
18 changes: 17 additions & 1 deletion app/javascript/projects/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import './sidebar.css'
import { ReactSortable } from 'react-sortablejs'
import { nevoLevelNames, nevoPropertyNames } from './nevo'
import { AtiLayer, CropMapLayer, DatasetLayer, Layer, ModelOutputLayer, NevoLayer, OverlayLayer, ShapeLayer, State } from './state'
import { AtiLayer, CropMapLayer, DatasetLayer, Layer, MLLayer, ModelOutputLayer, NevoLayer, OverlayLayer, ShapeLayer, State } from './state'
import { iconForLayerType } from "./util"
import { getColorStops } from './reify_layer/model_output'
import { tileGridStats } from './modelling/tile_grid'
Expand Down Expand Up @@ -234,6 +234,18 @@ function ModelOutputLayerSettings({ layer, mutate, layerType }: ModelOutputLayer
}
}

interface MLLayerSettingsProps {
layer: MLLayer
}

const MLLayerSettings = ({ layer }: MLLayerSettingsProps) => (
<details className="mt-3">
<summary>Legend</summary>
<span className="swatch" style={{ backgroundColor: "#008000" }} /> Hedge<br />
<span className="swatch" style={{ backgroundColor: "#ffee00" }} /> Tree<br />
</details>
)

export function ZoomData({zoom, area, length}) {
const unit = area < 1 ? "cm²" : (area > 1000000 ? "km²" : "m²")
length = area < 1 ? length * 100 : (area > 1000000 ? length / 1000 : length)
Expand Down Expand Up @@ -701,6 +713,10 @@ export const Sidebar = ({ state, selectLayer, mutateLayer, deleteLayer, setLayer
selectedLayer?.type == "ShapeLayer" &&
<ShapeLayerSettings layer={selectedLayer}/>
}
{
selectedLayer?.type == "MLLayer" &&
<MLLayerSettings layer={selectedLayer} />
}
</> :
<em>No layer selected</em>
}
Expand Down
7 changes: 6 additions & 1 deletion app/javascript/projects/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,12 @@ export interface DatasetLayer extends BaseLayer {
deleted?: boolean
}

export type Layer = OsmLayer | MapTileLayer | OverlayLayer | NevoLayer | CehLandCoverLayer | ModelOutputLayer | DatasetLayer | CropMapLayer | AtiLayer | ShapeLayer | BoundaryLayer
export interface MLLayer extends BaseLayer {
type: "MLLayer"
layerName: string
}

export type Layer = OsmLayer | MapTileLayer | OverlayLayer | NevoLayer | CehLandCoverLayer | ModelOutputLayer | DatasetLayer | CropMapLayer | AtiLayer | ShapeLayer | BoundaryLayer | MLLayer

export interface Project {
name: string
Expand Down
1 change: 1 addition & 0 deletions app/javascript/projects/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export function iconForLayerType(type: Layer['type']) {
case "OverlayLayer":
return "fa-draw-polygon"
case "ModelOutputLayer":
case "MLLayer":
return "fa-project-diagram"
case "ShapeLayer":
case "BoundaryLayer":
Expand Down