Skip to content

Commit

Permalink
Merge branch 'main' into feature/routing
Browse files Browse the repository at this point in the history
  • Loading branch information
datKaMa committed Feb 3, 2025
2 parents 4052ef7 + 5c31fb5 commit 55dda52
Show file tree
Hide file tree
Showing 99 changed files with 1,840 additions and 599 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[*.{js,ts,vue,json}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _Summarization of the changes in a short and concise sentence._

## Instructions for local reproduction and review

## Pull Request Checklist (for Reviewee)
## Pull Request Checklist (for Assignee)

- [ ] Changelogs are maintained
- [ ] Functionality has been tested in Firefox, Chrome, Safari
Expand Down
8 changes: 4 additions & 4 deletions e2e/draw.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test('clicks to the map produce a fetchable pin coordinate', async ({
y += height / 2

await page.getByLabel('Draw tools').click()
await page.getByText('Draw and write').click()
await page.getByText('Draw, write and measure').click()
await page.getByText('Polygon').click()

const moves: [number, number, string][] = [
Expand All @@ -41,7 +41,7 @@ test('clicks to the map produce a fetchable pin coordinate', async ({
expect(drawing.features[0].geometry.coordinates[0].length).toBe(7)
})

test('two features drawn at the same coordinate can be modified separately', async ({
/* test('two features drawn at the same coordinate can be modified separately', async ({
page,
}) => {
await openSnowbox(page)
Expand All @@ -56,7 +56,7 @@ test('two features drawn at the same coordinate can be modified separately', asy
y += height / 2
await page.getByLabel('Draw tools').click()
await page.getByText('Draw and write').click()
await page.getByText('Draw, write and measure').click()
await page.getByText('Point').click()
await page.mouse.click(x, y)
Expand All @@ -79,4 +79,4 @@ test('two features drawn at the same coordinate can be modified separately', asy
expect(drawing.features[0].geometry.coordinates[1]).not.toBe(
drawing.features[1].geometry.coordinates[1]
)
})
}) */
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const config: Config.InitialOptions = {
setupFiles: ['jest-canvas-mock'],
setupFilesAfterEnv: ['./__mocks__/jest.setup.js'],
transformIgnorePatterns: [
'/node_modules/(?!(@repositoryname/vuex-generators|@masterportal/masterportalapi|ol|geotiff|quick-lru|color-(space|parse|rgba|name))/)',
'/node_modules/(?!(@repositoryname/vuex-generators|@masterportal/masterportalapi|ol|pbf|earcut|geotiff|rbush|quickselect|quick-lru|color-(space|parse|rgba|name))/)',
],
}

Expand Down
Loading

0 comments on commit 55dda52

Please sign in to comment.