PB-101 : zoom on GPX extent on file added #626
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,55 @@ | ||
| import { expect } from 'chai' | ||
| import proj4 from 'proj4' | ||
| import { describe, it } from 'vitest' | ||
|
|
||
| import { LV95, WGS84 } from '@/utils/coordinates/coordinateSystems' | ||
| import { getExtentForProjection } from '@/utils/extentUtils' | ||
|
|
||
| describe('Test extent utils', () => { | ||
pakb marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| describe('reproject and cut extent within projection bounds', () => { | ||
| it('handles well wrong inputs and returns null', () => { | ||
| expect(getExtentForProjection()).to.be.null | ||
| expect(getExtentForProjection(null, null)).to.be.null | ||
| expect(getExtentForProjection(0, 0)).to.be.null | ||
| expect(getExtentForProjection({}, [])).to.be.null | ||
| expect(getExtentForProjection(LV95, [1, 2, 3])).to.be.null | ||
| }) | ||
| it('reproject extent of a single coordinate inside the bounds of the projection', () => { | ||
| const singleCoordinate = [8.2, 47.5] | ||
| const singleCoordinateInLV95 = proj4(WGS84.epsg, LV95.epsg, singleCoordinate).map( | ||
| LV95.roundCoordinateValue | ||
| ) | ||
| const extent = [singleCoordinate, singleCoordinate].flat() | ||
| expect(getExtentForProjection(LV95, extent)).to.deep.equal([ | ||
| singleCoordinateInLV95, | ||
| singleCoordinateInLV95, | ||
| ]) | ||
| }) | ||
| it('returns null if a single coordinate outside of bounds is given', () => { | ||
| const singleCoordinateOutOfLV95Bounds = [8.2, 40] | ||
| const extent = [singleCoordinateOutOfLV95Bounds, singleCoordinateOutOfLV95Bounds].flat() | ||
| expect(getExtentForProjection(LV95, extent)).to.be.null | ||
| }) | ||
| it('returns null if the extent given is completely outside of the projection bounds', () => { | ||
| const extent = [-5.0, -20.0, -25.0, -45.0] | ||
| expect(getExtentForProjection(LV95, extent)).to.be.null | ||
| }) | ||
| it('reproject and cut an extent that is greater than LV95 extent on all sides', () => { | ||
| const projectedExtent = getExtentForProjection(LV95, [-2.4, 35, 21.3, 51.7]) | ||
| expect(projectedExtent).to.deep.equal([LV95.bounds.bottomLeft, LV95.bounds.topRight]) | ||
| }) | ||
| it('only gives back the portion of an extent that is within LV95 bounds', () => { | ||
| const singleCoordinateInsideLV95 = [7.54, 48.12] | ||
| const singleCoordinateInLV95 = proj4( | ||
| WGS84.epsg, | ||
| LV95.epsg, | ||
| singleCoordinateInsideLV95 | ||
| ).map(LV95.roundCoordinateValue) | ||
| const overlappingExtent = [0, 0, ...singleCoordinateInsideLV95] | ||
| expect(getExtentForProjection(LV95, overlappingExtent)).to.deep.equal([ | ||
| LV95.bounds.bottomLeft, | ||
| singleCoordinateInLV95, | ||
| ]) | ||
| }) | ||
| }) | ||
| }) | ||
This file contains hidden or 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,19 @@ | ||
| import { expect } from 'chai' | ||
| import { describe, it } from 'vitest' | ||
|
|
||
| import { LV95 } from '@/utils/coordinates/coordinateSystems.js' | ||
| import { parseGpx } from '@/utils/gpxUtils.js' | ||
|
|
||
| describe('Test GPX utils', () => { | ||
| describe('parseGpx', () => { | ||
| it('handles correctly invalid inputs', () => { | ||
| expect(parseGpx()).to.be.null | ||
| expect(parseGpx(null, null)).to.be.null | ||
| expect(parseGpx(0, LV95)).to.be.null | ||
| expect(parseGpx([], LV95)).to.be.null | ||
| expect(parseGpx({}, LV95)).to.be.null | ||
| expect(parseGpx('', LV95)).to.be.null | ||
| }) | ||
| // further testing isn't really necessary as it's using out-of-the-box OL functions | ||
| }) | ||
| }) |
This file contains hidden or 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 hidden or 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 hidden or 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,35 @@ | ||
| import { getIntersection as getExtentIntersection, isEmpty as isExtentEmpty } from 'ol/extent' | ||
|
|
||
| import CoordinateSystem from '@/utils/coordinates/CoordinateSystem.class.js' | ||
| import { WGS84 } from '@/utils/coordinates/coordinateSystems' | ||
| import { normalizeExtent, projExtent } from '@/utils/coordinates/coordinateUtils' | ||
| import log from '@/utils/logging' | ||
|
|
||
| /** | ||
| * Get a flattened extent for the projection bounds. | ||
| * | ||
| * @param {CoordinateSystem} projection Projection in which to get the extent | ||
| * @param {[number, number, number, number]} extent Extent in WGS84 such as `[minx, miny, maxx, | ||
| * maxy]` | ||
| * @returns {null | [[number, number], [number, number]]} Return null if the extent is out of | ||
| * projection bounds or the intersection between the extent and projection bounds. The return | ||
| * extent is re-projected to the projection. The output format will be `[[minx, miny], [maxx, | ||
| * maxy]]`. | ||
| */ | ||
| export function getExtentForProjection(projection, extent) { | ||
| if (!(projection instanceof CoordinateSystem) || extent?.length !== 4) { | ||
| return null | ||
| } | ||
| const projectionBounds = projection.getBoundsAs(WGS84).flatten | ||
| let intersectExtent = getExtentIntersection(projectionBounds, extent) | ||
| log.debug( | ||
| `Get extent for projection ${projection.epsg}`, | ||
| `extent=${extent}`, | ||
| `projectionBounds=${projectionBounds}`, | ||
| `intersectExtent=${intersectExtent}` | ||
| ) | ||
| if (!isExtentEmpty(intersectExtent)) { | ||
| return normalizeExtent(projExtent(WGS84, projection, intersectExtent)) | ||
| } | ||
| return null | ||
| } |
This file contains hidden or 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
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.
You also need to handle this error here
web-mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
Line 79 in d9e436d