Skip to content

fix: pp date label field rename and intersect crash ( MAPCO-7054 , MAPCO-7056 ) #596

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

Merged
alebinson merged 2 commits into from
Mar 16, 2025
Merged

fix: pp date label field rename and intersect crash ( MAPCO-7054 , MAPCO-7056 ) #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5498878
fix: pp date label field rename and intersect crash
alebinson Mar 16, 2025
8d027bc
fix: git workflows to v4
alebinson Mar 16, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/Main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
node-version: [16.13.x]
steps:
- name: checkout
uses: actions/checkout@v2
- uses: actions/cache@v2
uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install yarn
Expand Down
19 changes: 12 additions & 7 deletions src/discrete-layer/components/layer-details/raster/pp-extent-vector-layer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,19 @@ export const PolygonPartsVectorLayer: React.FC<PolygonPartsVectorLayerProps> = o
const bbox = bboxPolygon(mapOl.getView().calculateExtent([size[0] + BUFFER,size[1] + BUFFER]) as BBox);
const extentPolygon = polygon(bbox.geometry.coordinates);

//@ts-ignore
const featureClippedPolygon = intersect(feat, extentPolygon);

if (featureClippedPolygon) {
const geometry = new GeoJSON().readGeometry(featureClippedPolygon.geometry);
greenStyle.setGeometry(geometry);
}
try{ // There is some cases when turf.intersect() throws exception, then no need to change geometry
// @ts-ignore
const featureClippedPolygon = intersect(feat, extentPolygon);

if (featureClippedPolygon) {
const geometry = new GeoJSON().readGeometry(featureClippedPolygon.geometry);
greenStyle.setGeometry(geometry);
}
}
catch(e){
console.log('*** PP: turf.intersect() failed ***', 'feat -->',feat, 'extentPolygon -->',extentPolygon);
}

return feat ? <GeoJSONFeature
geometry={{...feat.geometry}}
fit={false}
Expand Down
2 changes: 1 addition & 1 deletion src/discrete-layer/components/layer-details/raster/pp-map.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const getText = (feature: Feature, resolution: number, featureConfig: Record<str
const zoomLevel = Object.values(ZOOM_LEVELS_TABLE)
.map((res) => res.toString())
.findIndex(val => val === get(feature.properties, 'resolutionDegree')?.toString())
const ingestionDateUTC = dateFormatter(get(feature.properties, 'ingestionDateUtc'), false);
const ingestionDateUTC = dateFormatter(get(feature.properties, 'imagingTimeEndUTC'), false);
const updatedInVersion = get(feature.properties, 'productVersion');

let text = defaultText ?? '';
Expand Down