diff --git a/langs/layers/en.json b/langs/layers/en.json index eda2eeb64..8524657c6 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4113,6 +4113,7 @@ "name": "Drinking water", "presets": { "0": { + "description": "Typically a drinking fountain, water tap, water well or natural spring", "title": "a drinking water" } }, diff --git a/langs/themes/en.json b/langs/themes/en.json index 1963f3dfe..e1198eaee 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1425,4 +1425,4 @@ "shortDescription": "A map with waste baskets", "title": "Waste Basket" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index a22cc584b..1bb596583 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "generate:licenses": "vite-node scripts/generateLicenseInfo.ts -- --no-fail", "query:licenses": "vite-node scripts/generateLicenseInfo.ts -- --query", "generate:contributor-list": "vite-node scripts/generateContributors.ts", - "generate:schemas": "ts2json-schema -p Models/ThemeConfig/Json/ -o Docs/Schemas/ -t tsconfig.json -R . -m \".*ConfigJson\" && vite-node scripts/fixSchemas.ts ", + "generate:schemas": "ts2json-schema -p src/Models/ThemeConfig/Json/ -o Docs/Schemas/ -t tsconfig.json -R . -m \".*ConfigJson\" && vite-node scripts/fixSchemas.ts ", "watch:schemas": "cd Models/ThemeConfig/Json & ls | entr -s 'npm run generate:schemas' ", "generate:service-worker": "tsc src/service-worker.ts --outFile public/service-worker.js && git_hash=$(git rev-parse HEAD) && sed -i \"s/GITHUB-COMMIT/$git_hash/\" public/service-worker.js", "optimize-images": "cd assets/generated/ && find -name '*.png' -exec optipng '{}' \\; && echo 'PNGs are optimized'", diff --git a/scripts/fixSchemas.ts b/scripts/fixSchemas.ts index 4f9123aa5..5cb973d1d 100644 --- a/scripts/fixSchemas.ts +++ b/scripts/fixSchemas.ts @@ -1,10 +1,10 @@ import ScriptUtils from "./ScriptUtils" import { readFileSync, writeFileSync } from "fs" -import { JsonSchema } from "../UI/Studio/jsonSchema" -import { AllSharedLayers } from "../Customizations/AllSharedLayers" -import { AllKnownLayouts } from "../Customizations/AllKnownLayouts" -import { ConfigMeta } from "../UI/Studio/configMeta" -import { Utils } from "../Utils" +import { JsonSchema } from "../src/UI/Studio/jsonSchema" +import { AllSharedLayers } from "../src/Customizations/AllSharedLayers" +import { AllKnownLayouts } from "../src/Customizations/AllKnownLayouts" +import { ConfigMeta } from "../src/UI/Studio/configMeta" +import { Utils } from "../src/Utils" const metainfo = { type: "One of the inputValidator types", @@ -260,7 +260,7 @@ function extractMeta( substituteReferences(paths, themeSchema, allDefinitions) - writeFileSync("./assets/" + path + ".json", JSON.stringify(paths, null, " ")) + writeFileSync("./src/assets/" + path + ".json", JSON.stringify(paths, null, " ")) console.log("Written meta to ./assets/" + path) return Utils.NoNull(paths.map((p) => validateMeta(p))) } diff --git a/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts b/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts index e20ffa791..0de788c46 100644 --- a/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts +++ b/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts @@ -81,7 +81,6 @@ export interface TagRenderingConfigJson { * question: Should a freeform text field be shown? * Allow freeform text input from the user * ifunset: Do not add a freeform text field - * types: Use a freeform value */ freeform?: { /** diff --git a/src/UI/Studio/EditLayer.svelte b/src/UI/Studio/EditLayer.svelte index 45de9a90c..26d0aff19 100644 --- a/src/UI/Studio/EditLayer.svelte +++ b/src/UI/Studio/EditLayer.svelte @@ -1,14 +1,14 @@ +