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

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-04-01 12:56:51 +02:00
commit 796ee40f3b
169 changed files with 35962 additions and 464 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/generateTranslations.ts
View file

@ -302,11 +302,11 @@ function sortKeys(o: object): object{
* Formats the specified file, helps to prevent merge conflicts
* */
function formatFile(path) {
let contents = JSON.parse(readFileSync(path, "utf8"))
const original = readFileSync(path, "utf8")
let contents = JSON.parse(original)
contents = sortKeys(contents)
writeFileSync(path, JSON.stringify(contents, null, " "))
const endsWithNewline = original.endsWith("\n")
writeFileSync(path, JSON.stringify(contents, null, " ") + (endsWithNewline ? "\n" : ""))
}
/**

23
scripts/lint.ts
View file

@ -1,9 +1,10 @@
import ScriptUtils from "./ScriptUtils";
import {writeFileSync} from "fs";
import {mkdirSync, writeFileSync} from "fs";
import {FixLegacyTheme, UpdateLegacyLayer} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
import Translations from "../UI/i18n/Translations";
import {Translation} from "../UI/i18n/Translation";
import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
import {LayoutConfigJson} from "../Models/ThemeConfig/Json/LayoutConfigJson";
/*
* This script reads all theme and layer files and reformats them inplace
@ -49,11 +50,27 @@ function addArticleToPresets(layerConfig: {presets?: {title: any}[]}){
//*/
}
function extractInlineLayer(theme: LayoutConfigJson){
for (let i = 0; i < theme.layers.length; i++){
const layer = theme.layers[i];
if(typeof layer === "string"){
continue
}
if(layer["override"] !== undefined){
continue
}
const l = <LayerConfigJson> layer
mkdirSync("./assets/layers/"+l.id)
writeFileSync("./assets/layers/"+l.id+"/"+l.id+".json", JSON.stringify(l, null, " "))
theme.layers[i] = l.id
}
}
const layerFiles = ScriptUtils.getLayerFiles();
for (const layerFile of layerFiles) {
try {
const fixed =<LayerConfigJson> new UpdateLegacyLayer().convertStrict(layerFile.parsed, "While linting " + layerFile.path);
addArticleToPresets(fixed)
addArticleToPresets(fixed)
writeFileSync(layerFile.path, JSON.stringify(fixed, null, " "))
} catch (e) {
console.error("COULD NOT LINT LAYER" + layerFile.path + ":\n\t" + e)
@ -69,7 +86,7 @@ for (const themeFile of themeFiles) {
addArticleToPresets(<any> layer)
}
}
// extractInlineLayer(fixed)
writeFileSync(themeFile.path, JSON.stringify(fixed, null, " "))
} catch (e) {
console.error("COULD NOT LINT THEME" + themeFile.path + ":\n\t" + e)