Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Refactoring of conversion

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-04 01:05:35 +01:00
parent 5dffb3c5e7
commit 7eeffc2305
12 changed files with 389 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/LegacyThemeLoader.spec.ts
View file

@ -357,10 +357,7 @@ export default class LegacyThemeLoaderSpec extends T {
["Walking_node_theme", () => {
const config = LegacyThemeLoaderSpec.walking_node_theme
const fixed = new FixLegacyTheme().convert({
tagRenderings: new Map<string, TagRenderingConfigJson>(),
sharedLayers: new Map<string, LayerConfigJson>()
},
const fixed = new FixLegacyTheme().convert(
// @ts-ignore
config,
"While testing")
@ -414,7 +411,7 @@ export default class LegacyThemeLoaderSpec extends T {
}],
["Shadowed mappings are detected",
() => {
const r = new DetectShadowedMappings().convert(undefined, {
const r = new DetectShadowedMappings().convert({
mappings: [
{
if: {or: ["key=value", "x=y"]},
@ -428,7 +425,7 @@ export default class LegacyThemeLoaderSpec extends T {
}, "test");
T.isTrue(r.errors.length > 0, "Failing case is not detected")
const r0 = new DetectShadowedMappings().convert(undefined, {
const r0 = new DetectShadowedMappings().convert( {
mappings: [
{
if: {or: ["key=value", "x=y"]},

4
test/Theme.spec.ts
View file

@ -40,10 +40,10 @@ export default class ThemeSpec extends T {
Constants.added_by_default.splice(0, Constants.added_by_default.length)
const sharedLayers = new Map<string, LayerConfigJson>()
sharedLayers.set("public_bookcase", bookcaseLayer["default"])
themeConfigJson = new PrepareTheme().convertStrict({
themeConfigJson = new PrepareTheme({
tagRenderings: new Map<string, TagRenderingConfigJson>(),
sharedLayers: sharedLayers
}, themeConfigJson, "test")
}).convertStrict( themeConfigJson, "test")
const themeConfig = new LayoutConfig(themeConfigJson);
assert.equal("xyz", themeConfig.layers[0].source.geojsonSource)