contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Resolved accidentally commited merge conflict

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-01-18 19:46:37 +01:00
parent 4baf47b868
commit 1df25ff91e
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/createLayouts.ts
View file

@ -7,11 +7,7 @@ import LayoutConfig from "../Customizations/JSON/LayoutConfig";
import {AllKnownLayouts} from "../Customizations/AllKnownLayouts"; import {AllKnownLayouts} from "../Customizations/AllKnownLayouts";
import {existsSync, mkdirSync, readFileSync, writeFile, writeFileSync} from "fs"; import {existsSync, mkdirSync, readFileSync, writeFile, writeFileSync} from "fs";
import Locale from "../UI/i18n/Locale"; import Locale from "../UI/i18n/Locale";
<<<<<<< HEAD
// import svg2img from 'promise-svg2img';
=======
import * as sharp from "sharp" import * as sharp from "sharp"
>>>>>>> master
import Translations from "../UI/i18n/Translations"; import Translations from "../UI/i18n/Translations";
import {Translation} from "../UI/i18n/Translation"; import {Translation} from "../UI/i18n/Translation";
@ -105,12 +101,7 @@ function generateWikiEntry(layout: LayoutConfig) {
const alreadyWritten = [] const alreadyWritten = []
<<<<<<< HEAD
function createIcon(iconPath: string, size: number, layout: LayoutConfig) {
=======
async function createIcon(iconPath: string, size: number, layout: LayoutConfig) { async function createIcon(iconPath: string, size: number, layout: LayoutConfig) {
>>>>>>> master
let name = iconPath.split(".").slice(0, -1).join("."); let name = iconPath.split(".").slice(0, -1).join(".");
if (name.startsWith("./")) { if (name.startsWith("./")) {
name = name.substr(2) name = name.substr(2)
@ -157,13 +148,7 @@ async function createIcon(iconPath: string, size: number, layout: LayoutConfig)
return newname; return newname;
} }
<<<<<<< HEAD
//*/
function createManifest(layout: LayoutConfig, relativePath: string) {
=======
async function createManifest(layout: LayoutConfig, relativePath: string) { async function createManifest(layout: LayoutConfig, relativePath: string) {
>>>>>>> master
const name = layout.id; const name = layout.id;
const icons = []; const icons = [];
@ -179,10 +164,6 @@ async function createManifest(layout: LayoutConfig, relativePath: string) {
writeFileSync(path, layout.icon) writeFileSync(path, layout.icon)
} }
<<<<<<< HEAD
=======
>>>>>>> master
const sizes = [72, 96, 120, 128, 144, 152, 180, 192, 384, 512]; const sizes = [72, 96, 120, 128, 144, 152, 180, 192, 384, 512];
for (const size of sizes) { for (const size of sizes) {
const name = await createIcon(path, size, layout); const name = await createIcon(path, size, layout);