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

Merge branch 'develop' into feature/maproulette

Browse source
This commit is contained in:
Robin van der Linde 2022-07-19 09:38:12 +02:00
commit 330f1f53f3
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
72 changed files with 29673 additions and 611 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Models/Constants.ts
View file

@ -2,7 +2,7 @@ import {Utils} from "../Utils";
export default class Constants {
public static vNumber = "0.22.1";
public static vNumber = "0.23.0";
public static ImgurApiKey = '7070e7167f0a25a'
public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85"

4
Models/ThemeConfig/Json/LayerConfigJson.ts
View file

@ -287,9 +287,9 @@ export interface LayerConfigJson {
*/
tagRenderings?:
(string
| { builtin: string | string[], override: any }
| { builtin: string | string[], override: Partial<QuestionableTagRenderingConfigJson> }
| QuestionableTagRenderingConfigJson
| RewritableConfigJson<(string | { builtin: string, override: any } | QuestionableTagRenderingConfigJson)[]>
| RewritableConfigJson<(string | { builtin: string, override: Partial<QuestionableTagRenderingConfigJson> } | QuestionableTagRenderingConfigJson)[]>
) [],

2
Models/ThemeConfig/Json/LayoutConfigJson.ts
View file

@ -150,7 +150,7 @@ export interface LayoutConfigJson {
*
* In the above scenario, `sometagrendering` will be added at the beginning of the tagrenderings of every layer
*/
overrideAll?: any;
overrideAll?: Partial<any | LayerConfigJson>;
/**
* The id of the default background. BY default: vanilla OSM