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

fix(frontend): display submission point feature if feature not in extract #1638

Merged
merged 3 commits into from
Jul 9, 2024
Merged

fix(frontend): display submission point feature if feature not in extract #1638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dda892
feat(submissionDetails): show submission point if no submission featu…
NSUWAL123 Jul 9, 2024
d755151
feat(submissionInstanceMap): style, zoomToLayer fix
NSUWAL123 Jul 9, 2024
de43720
Merge branch 'development' of github.com:hotosm/fmtm into fix/submisi…
NSUWAL123 Jul 9, 2024
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
9 changes: 8 additions & 1 deletion src/frontend/src/components/SubmissionMap/SubmissionInstanceMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,16 @@ const SubmissionInstanceMap = ({ featureGeojson }: submissionInstanceMapPropType
{featureGeojson?.type && (
<VectorLayer
geojson={featureGeojson}
viewProperties={{
size: map?.getSize(),
padding: [50, 50, 50, 50],
constrainResolution: true,
duration: 2000,
maxZoom: 20,
}}
zIndex={10}
zoomToLayer
style={{ ...defaultStyles, lineColor: '#D73F37', lineThickness: 2 }}
style={{ ...defaultStyles, lineColor: '#D73F37', lineThickness: 2, circleRadius: 10, fillColor: '#D73F37' }}
/>
)}
</MapComponent>
Expand Down
20 changes: 17 additions & 3 deletions src/frontend/src/views/SubmissionDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ const SubmissionDetails = () => {
const projectDashboardLoading = useAppSelector((state) => state.project.projectDashboardLoading);
const submissionDetails = useAppSelector((state) => state.submission.submissionDetails);
const submissionDetailsLoading = useAppSelector((state) => state.submission.submissionDetailsLoading);
const taskId = submissionDetails?.task_id;
const taskId = submissionDetails?.task_id
? submissionDetails?.task_id
: submissionDetails?.task_filter
? submissionDetails?.task_filter
: '-';

useEffect(() => {
dispatch(GetProjectDashboard(`${import.meta.env.VITE_API_URL}/projects/project_dashboard/${projectId}`));
Expand Down Expand Up @@ -54,7 +58,7 @@ const SubmissionDetails = () => {
}
const filteredData = submissionDetails ? removeNullValues(submissionDetails) : {};

var coordinatesArray: [number, number][] = submissionDetails?.xlocation?.split(';').map(function (coord: string) {
const coordinatesArray: [number, number][] = submissionDetails?.xlocation?.split(';').map(function (coord: string) {
let coordinate = coord
.trim()
.split(' ')
Expand All @@ -79,6 +83,14 @@ const SubmissionDetails = () => {
],
};

const pointFeature = {
type: 'Feature',
geometry: {
...submissionDetails?.point,
},
properties: {},
};

const renderValue = (value: any, key: string = '') => {
if (key === 'start' || key === 'end') {
return (
Expand Down Expand Up @@ -169,7 +181,9 @@ const SubmissionDetails = () => {
</div>
<div className="fmtm-flex fmtm-flex-grow fmtm-justify-center">
<div className="fmtm-w-full fmtm-my-10 xl:fmtm-my-0 xl:fmtm-w-[500px] 2xl:fmtm-w-[700px] fmtm-h-[300px] fmtm-rounded-lg fmtm-overflow-hidden">
<SubmissionInstanceMap featureGeojson={geojsonFeature} />
<SubmissionInstanceMap
featureGeojson={coordinatesArray ? geojsonFeature : submissionDetails?.point ? pointFeature : {}}
/>
</div>
</div>
</div>
Expand Down
Loading