Task/wg 403 create asset geometry component #295
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import React from 'react'; | ||
| import { render } from '@testing-library/react'; | ||
| import GeometryAsset from './AssetGeometry'; | ||
| import { mockImgFeature } from '@hazmapper/__fixtures__/featuresFixture'; | ||
|
|
||
| jest.mock('@turf/turf', () => ({ | ||
| ...jest.requireActual('@turf/turf'), | ||
| area: jest.fn(() => 1234.56), | ||
| length: jest.fn(() => 5678.9), | ||
| bbox: jest.fn(() => [10, 20, 30, 40]), | ||
| })); | ||
|
|
||
| jest.mock('@hazmapper/hooks', () => ({ | ||
| useFeatureSelection: jest.fn(), | ||
| })); | ||
|
|
||
| describe('AssetGeometry', () => { | ||
| const GeometryAssetProps = { | ||
| selectedFeature: mockImgFeature, | ||
| }; | ||
|
|
||
| it('renders geometry for point on an image', () => { | ||
| const { getByText } = render(<GeometryAsset {...GeometryAssetProps} />); | ||
| expect(getByText('Geometry: Point')).toBeDefined(); | ||
| expect(getByText('Latitude')).toBeDefined(); | ||
| expect(getByText('Longitude')).toBeDefined(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import React from 'react'; | ||
| import _ from 'lodash'; | ||
| import * as turf from '@turf/turf'; | ||
| import { Feature, FeatureType, getFeatureType } from '@hazmapper/types'; | ||
|
|
||
| interface AssetGeometryProps { | ||
| selectedFeature: Feature; | ||
| } | ||
|
|
||
| const AssetGeometry: React.FC<AssetGeometryProps> = ({ selectedFeature }) => { | ||
| if (!selectedFeature?.geometry) return null; | ||
|
|
||
| const bbox = | ||
| selectedFeature.geometry.type !== 'Point' | ||
| ? turf.bbox(selectedFeature) | ||
| : null; | ||
|
|
||
| const geometryType: FeatureType = getFeatureType(selectedFeature); | ||
|
There was a problem hiding this comment. do you want to A) keep the variable name and then comment that you are considering only geometry types (subset of FeatureType). 🤔 or maybe: B) there is a difference currently with angular version, as here if its an something like an image or video feature, we don't show point coordinates (as its featureType would be (good tests by the way as covers this case well 💯 ) There was a problem hiding this comment. Good point, I think B works well. This is updated with the latest push |
||
|
|
||
| return ( | ||
| <> | ||
| {geometryType === FeatureType.Point && ( | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <th className="text-center" colSpan={2}> | ||
| Geometry: {_.startCase(selectedFeature.geometry.type)} | ||
| </th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <td>Latitude</td> | ||
| <td>{turf.bbox(selectedFeature.geometry)[0]}</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Longitude</td> | ||
| <td>{turf.bbox(selectedFeature.geometry)[1]}</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| )} | ||
| {(geometryType === FeatureType.Polygon || | ||
| geometryType === FeatureType.MultiPolygon) && ( | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <th className="text-center" colSpan={2}> | ||
| Geometry: {_.startCase(selectedFeature.geometry.type)} | ||
| </th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <td>Area (m²)</td> | ||
| <td>{turf.area(selectedFeature as turf.Feature).toFixed(2)}</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| )} | ||
| {(geometryType === FeatureType.LineString || | ||
| geometryType === FeatureType.MultiLineString) && ( | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <th className="text-center" colSpan={2}> | ||
| Geometry: {_.startCase(selectedFeature.geometry.type)} | ||
| </th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <td>Length (m)</td> | ||
| <td>{turf.length(selectedFeature as turf.Feature).toFixed(2)}</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| )} | ||
| {geometryType !== FeatureType.Point && bbox && ( | ||
| <table> | ||
| <thead> | ||
| {selectedFeature.geometry.type === 'GeometryCollection' && ( | ||
| <tr> | ||
| <th className="text-center" colSpan={2}> | ||
| Geometry: {_.startCase(selectedFeature.geometry.type)} | ||
| </th> | ||
| </tr> | ||
| )} | ||
| <tr> | ||
| <th colSpan={3} className="text-center"> | ||
| Bounding Box | ||
| </th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <td></td> | ||
| <td>Latitude</td> | ||
| <td>Longitude</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Minimum</td> | ||
| <td>{turf.bbox(selectedFeature.geometry)[1]}</td> | ||
| <td>{turf.bbox(selectedFeature.geometry)[0]}</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Maximum</td> | ||
| <td>{turf.bbox(selectedFeature.geometry)[3]}</td> | ||
| <td>{turf.bbox(selectedFeature.geometry)[2]}</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| )} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default AssetGeometry; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Things taken out here were styles that were not being applied by the browser