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

Merge branch 'develop' into feature/goejson-export

Browse source 
# Conflicts:
#	tslint.json
This commit is contained in:
Arno Deceuninck 2021-07-15 11:48:06 +02:00
commit fc459e6011
86 changed files with 2254 additions and 681 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Utils.ts
View file

@ -1,4 +1,5 @@
import * as colors from "./assets/colors.json"
import {TileRange} from "./Models/TileRange";
export class Utils {
@ -134,7 +135,7 @@ export class Utils {
}
return newArr;
}
public static MergeTags(a: any, b: any) {
const t = {};
for (const k in a) {
@ -456,12 +457,3 @@ export class Utils {
}
}
export interface TileRange {
xstart: number,
ystart: number,
xend: number,
yend: number,
total: number,
zoomlevel: number
}