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

Trees mapped according to site #111

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
13 changes: 8 additions & 5 deletions web/src/components/Map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,18 +233,21 @@ export const Map = ({ initialOverlay, urlProjectId, mediaSize }) => {

// Fetch tree data
useEffect(() => {
if (activeProjectData) {
if (activeProjectData && activeProjectPolygon) {
const siteName = activeProjectPolygon?.features[0]?.properties?.name
const projectName = activeProjectData?.project?.name
const dashedProjectName = projectName.toLowerCase().replaceAll(' ', '-')
if (dashedProjectName) {
const treesEndpoint = `shapefiles/${dashedProjectName}-all-tree-plantings.geojson`
const dashedProjectName = projectName?.toLowerCase().replaceAll(' ', '-')
const dashedSiteName = siteName?.toLowerCase().replaceAll(' ', '-')

if (dashedProjectName && dashedSiteName) {
const treesEndpoint = `shapefiles/${dashedProjectName}-${dashedSiteName}-all-tree-plantings.geojson`
const fetchData = async () => {
await fetchTreeShapefile(treesEndpoint, setActiveProjectTreesPlanted)
}
fetchData().catch(console.error)
}
}
}, [activeProjectData])
}, [activeProjectData, activeProjectPolygon])

useEffect(() => {
if (map && activeProjectMosaic) {
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Overlays/Info/PaymentsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export const PaymentCard = ({ activeProjectData }) => {
const celoMessageRes = await attestationDataCall({
data: {
query: `{
attestations(where: {recipient:{equals:"${recipient}"}}) {
attestations(where: {recipient:{mode: insensitive, equals:"${recipient}"}}) {
id
decodedDataJson
}
Expand Down