forked from MapComplete/MapComplete
Chore: fix tests, remove obsolete imports
This commit is contained in:
parent
3f577e7978
commit
2ea9236d37
6 changed files with 13 additions and 14 deletions
|
@ -1,10 +1,9 @@
|
|||
import { LayerConfigJson } from "../../../../src/Models/ThemeConfig/Json/LayerConfigJson"
|
||||
import LineRenderingConfigJson from "../../../../src/Models/ThemeConfig/Json/LineRenderingConfigJson"
|
||||
import { PrepareLayer, RewriteSpecial } from "../../../../src/Models/ThemeConfig/Conversion/PrepareLayer"
|
||||
import {
|
||||
PrepareLayer,
|
||||
RewriteSpecial,
|
||||
} from "../../../../src/Models/ThemeConfig/Conversion/PrepareLayer"
|
||||
import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
|
||||
QuestionableTagRenderingConfigJson
|
||||
} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
|
||||
import RewritableConfigJson from "../../../../src/Models/ThemeConfig/Json/RewritableConfigJson"
|
||||
import { describe, expect, it } from "vitest"
|
||||
|
||||
|
@ -68,7 +67,7 @@ describe("PrepareLayer", () => {
|
|||
|
||||
const expected = {
|
||||
id: "testlayer",
|
||||
source: { osmTags: "key=value" },
|
||||
source: { osmTags: { "and": ["key=value"] } },
|
||||
lineRendering: [
|
||||
{
|
||||
color: {
|
||||
|
|
|
@ -2,7 +2,7 @@ import { ThemeConfigJson } from "../../../../src/Models/ThemeConfig/Json/ThemeCo
|
|||
import { LayerConfigJson } from "../../../../src/Models/ThemeConfig/Json/LayerConfigJson"
|
||||
import { PrepareTheme } from "../../../../src/Models/ThemeConfig/Conversion/PrepareTheme"
|
||||
import ThemeConfig from "../../../../src/Models/ThemeConfig/ThemeConfig"
|
||||
import bookcaseLayer from "../../../../src/assets/generated/layers/public_bookcase.json"
|
||||
import bookcaseLayer from "../../../../public/assets/generated/layers/public_bookcase.json"
|
||||
import LayerConfig from "../../../../src/Models/ThemeConfig/LayerConfig"
|
||||
import { ExtractImages } from "../../../../src/Models/ThemeConfig/Conversion/FixImages"
|
||||
import cyclofix from "../../../../public/assets/generated/themes/cyclofix.json"
|
||||
|
@ -10,7 +10,9 @@ import { Tag } from "../../../../src/Logic/Tags/Tag"
|
|||
import { DesugaringContext } from "../../../../src/Models/ThemeConfig/Conversion/Conversion"
|
||||
import { And } from "../../../../src/Logic/Tags/And"
|
||||
import { describe, expect, it } from "vitest"
|
||||
import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
|
||||
import {
|
||||
QuestionableTagRenderingConfigJson
|
||||
} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
|
||||
import Constants from "../../../../src/Models/Constants"
|
||||
import { ConversionContext } from "../../../../src/Models/ThemeConfig/Conversion/ConversionContext"
|
||||
import { MinimalTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/TagRenderingConfigJson"
|
||||
|
@ -188,7 +190,7 @@ describe("PrepareTheme", () => {
|
|||
expect(rewritten.layers[1]).toEqual({
|
||||
_basedOn: "layer-example",
|
||||
source: {
|
||||
osmTags: "x=y",
|
||||
osmTags: { "and": ["x=y"] }
|
||||
},
|
||||
id: "layer-example",
|
||||
name: null,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue