ag visual farm added to the dev branch field related stuff not imported yet, and the geocoder has some bugs with the new version
This commit is contained in:
parent
b4da0d6859
commit
022925d7d7
41 changed files with 8895 additions and 79 deletions
|
|
@ -1,6 +1,6 @@
|
|||
import GrainDescriber from "grain/GrainDescriber";
|
||||
import { cloneDeep } from "lodash";
|
||||
// import { MarkerData } from "Maps/mapMarkers/Markers";
|
||||
import { MarkerData } from "maps/mapMarkers/Markers";
|
||||
import { pond } from "protobuf-ts/pond";
|
||||
import { stringToMaterialColour } from "utils/strings";
|
||||
import { or } from "utils/types";
|
||||
|
|
@ -176,25 +176,25 @@ export class Bin {
|
|||
return s;
|
||||
}
|
||||
|
||||
// public getMarkerData(
|
||||
// clickFunc?: (event: React.PointerEvent<HTMLElement>, index: number, isMobile: boolean) => void,
|
||||
// updateFunc?: (location: pond.Location) => void
|
||||
// ): MarkerData {
|
||||
// let m: MarkerData = {
|
||||
// centered: true,
|
||||
// longitude: this.location()?.longitude ?? 0,
|
||||
// latitude: this.location()?.latitude ?? 0,
|
||||
// title: this.name(),
|
||||
// colour: this.grainColour(),
|
||||
// visibleLevels: { min: 17 },
|
||||
// graphPercent: this.fillPercent(),
|
||||
// customSize: this.settings.theme?.height,
|
||||
// details: [this.name() + ", " + this.binFillCap()],
|
||||
// clickFunc: clickFunc,
|
||||
// updateFunc: updateFunc
|
||||
// };
|
||||
// return m;
|
||||
// }
|
||||
public getMarkerData(
|
||||
clickFunc?: (event: React.PointerEvent<HTMLElement>, index: number, isMobile: boolean) => void,
|
||||
updateFunc?: (location: pond.Location) => void
|
||||
): MarkerData {
|
||||
let m: MarkerData = {
|
||||
centered: true,
|
||||
longitude: this.location()?.longitude ?? 0,
|
||||
latitude: this.location()?.latitude ?? 0,
|
||||
title: this.name(),
|
||||
colour: this.grainColour(),
|
||||
visibleLevels: { min: 17 },
|
||||
graphPercent: this.fillPercent(),
|
||||
customSize: this.settings.theme?.height,
|
||||
details: [this.name() + ", " + this.binFillCap()],
|
||||
clickFunc: clickFunc,
|
||||
updateFunc: updateFunc
|
||||
};
|
||||
return m;
|
||||
}
|
||||
|
||||
/**
|
||||
* returns the bushels per tonne set in the bins settings, if not set will return 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue