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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-12-22 01:09:33 +01:00
commit 70aa6eb003
26 changed files with 89 additions and 1083 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Models/Constants.ts
View file

@ -18,7 +18,7 @@ export default class Constants {
public static readonly added_by_default: string[] = ["gps_location", "gps_location_history", "home_location", "gps_track"]
public static readonly no_include: string[] = ["conflation", "left_right_style", "split_point","current_view"]
public static readonly no_include: string[] = ["conflation", "left_right_style", "split_point","current_view","matchpoint"]
/**
* Layer IDs of layers which have special properties through built-in hooks
*/

2
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -69,7 +69,7 @@ export default class PointRenderingConfig extends WithContextLoader {
if (iconPath !== undefined && iconPath.startsWith(Utils.assets_path)) {
const iconKey = iconPath.substr(Utils.assets_path.length);
if (Svg.All[iconKey] === undefined) {
throw "Builtin SVG asset not found: " + iconPath;
throw context+": builtin SVG asset not found: " + iconPath;
}
}
this.iconSize = this.tr("iconSize", "40,40,center");