Draw latvia contour, rescale canvas

This commit is contained in:
Guntis Smaukstelis
2025-02-18 15:37:17 +02:00
parent b78e8c20b6
commit cb9e6a88a0
4 changed files with 60 additions and 11 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ object Main extends IOApp {
.flatMap(fetchService.fetchSingleFile) .flatMap(fetchService.fetchSingleFile)
.flatMap { .flatMap {
case Right((name, content)) => postgresService.save(name, content) case Right((name, content)) => postgresService.save(name, content)
case Left(error) => IO.raiseError(error) case Left(_) => IO.unit // ignore error
} }
fetchCsvTask = scheduler.scheduleTask("Fetch CSV", List(31), fetchCsvList).compile.drain fetchCsvTask = scheduler.scheduleTask("Fetch CSV", List(31), fetchCsvList).compile.drain
+11 -1
View File
@@ -8,7 +8,7 @@ import { drawGrib } from './draw/drawGrib'
import { fetchWindData, isCalculatedWindDirection } from './draw/windDirection' import { fetchWindData, isCalculatedWindDirection } from './draw/windDirection'
import { fetchHourPrecipitationData, isCalculatedHourPrecipitation } from './draw/precipitation' import { fetchHourPrecipitationData, isCalculatedHourPrecipitation } from './draw/precipitation'
const CROP_BOUNDS = { x: 1906-1-400, y: 950, width: 400, height: 300 } const CROP_BOUNDS = { x: 1906-1-440, y: 895, width: 440, height: 380 }
export const GribFile: Component<{ export const GribFile: Component<{
name: string, name: string,
@@ -81,6 +81,16 @@ export const GribFile: Component<{
.finally(() => setIsLoading(false)) .finally(() => setIsLoading(false))
} }
///// HACK - delete this
// createEffect(() => {
// if (
// getFileGribList().length
// && name === 'harmonie_2025-02-18T0900Z_2025-02-18T1900Z.grib'
// ) {
// onParamClick(5)
// }
// })
return <li return <li
class={getIsActive() ? styles.active : ''} class={getIsActive() ? styles.active : ''}
onClick={() => onClick(name)} onClick={() => onClick(name)}
+4 -1
View File
@@ -14,13 +14,16 @@ export const Harmonie: Component<{}> = () => {
const [getCanvas, setCanvas] = createSignal<HTMLCanvasElement>() const [getCanvas, setCanvas] = createSignal<HTMLCanvasElement>()
const [getIsLoading, setIsLoading] = createSignal(true) const [getIsLoading, setIsLoading] = createSignal(true)
const [getIsCrop, setIsCrop] = createSignal(true) const [getIsCrop, setIsCrop] = createSignal(true)
const [getIsContour, setIsContour] = createSignal(false) const [getIsContour, setIsContour] = createSignal(true)
const [getGribList, setGribList] = createSignal<GribMessage[]>([]) const [getGribList, setGribList] = createSignal<GribMessage[]>([])
fetchJson(`${apiHost}/api/show/grib-list`) fetchJson(`${apiHost}/api/show/grib-list`)
.then(fileList => { .then(fileList => {
fileList.sort((a: string, b: string) => a < b ? 1 : -1) fileList.sort((a: string, b: string) => a < b ? 1 : -1)
setFileList(fileList) setFileList(fileList)
// HACK - remove this
// onGribMessageClick('teeest')
}) })
.finally(() => setIsLoading(false)) .finally(() => setIsLoading(false))
+44 -8
View File
@@ -14,6 +14,11 @@ latviaBoderImg.src = latvia_border
export type CropBounds = { x: number, y: number, width: number, height: number } export type CropBounds = { x: number, y: number, width: number, height: number }
/*
* final cropped size should be 1365x576px - divided by 3 (455x192) or 3.5 (390x165)
* image should be rotade 26 degrees
* currently image is 400x300px
*/
export function drawGrib( export function drawGrib(
canvas: HTMLCanvasElement, canvas: HTMLCanvasElement,
messages: GribMessage[], messages: GribMessage[],
@@ -41,8 +46,9 @@ export function drawGrib(
canvas.width = cols canvas.width = cols
canvas.height = rows canvas.height = rows
canvas.style.width = '100%' // canvas.style.width = '100%'
canvas.style.minWidth = '1280px' // canvas.style.minWidth = '1365px'
// canvas.style.border = '1px solid red'
const ctx = canvas.getContext('2d')! const ctx = canvas.getContext('2d')!
let imgData = ctx.createImageData(cols, rows) let imgData = ctx.createImageData(cols, rows)
@@ -60,10 +66,13 @@ export function drawGrib(
ctx.save() ctx.save()
ctx.scale(1, -1) ctx.scale(1, -1)
ctx.drawImage(tempCanvas, 0, -canvas.height) ctx.drawImage(tempCanvas, 0, -canvas.height)
// ctx.drawImage(tempCanvas, 0, 0)
ctx.restore() ctx.restore()
if (isContour && !!cropBounds) { if (cropBounds) {
drawRotate(canvas, ctx)
}
if (isContour && cropBounds) {
drawContour(canvas, ctx) // draw latvia contour only on cropped image drawContour(canvas, ctx) // draw latvia contour only on cropped image
} }
} }
@@ -147,15 +156,42 @@ function fillImageData(
} }
} }
function drawRotate(
canvas: HTMLCanvasElement,
ctx: CanvasRenderingContext2D,
angleDegrees = 26,
// angleDegrees = 0,
) {
const tempCanvas = document.createElement('canvas')
tempCanvas.width = canvas.width
tempCanvas.height = canvas.height
const tempCtx = tempCanvas.getContext('2d')!
tempCtx.save()
tempCtx.translate(tempCanvas.width/2, tempCanvas.height/2)
tempCtx.rotate(angleDegrees * Math.PI/180)
tempCtx.drawImage(canvas, -canvas.width/2, -canvas.height/2)
tempCtx.restore()
ctx.clearRect(0, 0, canvas.width, canvas.height)
// canvas.width = 390
// canvas.height = 165
canvas.width = 1365
canvas.height = 576
ctx.save()
ctx.translate(canvas.width/2, canvas.height/2)
ctx.scale(3.5, 3.5)
ctx.drawImage(tempCanvas, -tempCanvas.width/2, -tempCanvas.height/2)
ctx.restore()
}
function drawContour( function drawContour(
canvas: HTMLCanvasElement, canvas: HTMLCanvasElement,
ctx: CanvasRenderingContext2D, ctx: CanvasRenderingContext2D,
): void { ): void {
ctx.save() ctx.save()
ctx.translate(canvas.width/2 + 8, canvas.height/2 - 5) ctx.translate(canvas.width/2 +120, canvas.height/2 -20)
const angle = -26 // TODO create contour image exact scale when sizes will be accepted
ctx.rotate(angle * Math.PI / 180) const scale = 5.3/3.5
const scale = 5.3
const scaledWidth = latviaBoderImg.width/scale const scaledWidth = latviaBoderImg.width/scale
const scaledHeight = latviaBoderImg.height/scale const scaledHeight = latviaBoderImg.height/scale
ctx.drawImage(latviaBoderImg, ctx.drawImage(latviaBoderImg,