Quickfix: add centroids to some renderings which dissappeared during migration

This commit is contained in:
Pieter Vander Vennet 2021-11-08 15:08:24 +01:00
parent c3a4015f53
commit 161bcc8647
11 changed files with 1001 additions and 1036 deletions

View file

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

View file

@ -17,7 +17,6 @@ export default class LineRenderingConfig extends WithContextLoader {
this.color = this.tr("color", "#0000ff"); this.color = this.tr("color", "#0000ff");
this.width = this.tr("width", "7"); this.width = this.tr("width", "7");
this.dashArray = this.tr("dashArray", ""); this.dashArray = this.tr("dashArray", "");
this.leftRightSensitive = json.offset !== undefined && json.offset !== 0 && json.offset !== "0" this.leftRightSensitive = json.offset !== undefined && json.offset !== 0 && json.offset !== "0"
this.offset = this.tr("offset", "0"); this.offset = this.tr("offset", "0");

View file

@ -55,7 +55,7 @@ export default class TagRenderingConfig {
if (typeof json === "number") { if (typeof json === "number") {
this.render = Translations.WT("" + json) this.render = Translations.T("" + json, context + ".render")
return; return;
} }

View file

@ -47,7 +47,7 @@ export default class Translations {
return undefined; return undefined;
} }
if (typeof (s) === "string") { if (typeof (s) === "string") {
return new Translation({en: s}); return new Translation({'*': s});
} }
if (s instanceof Translation) { if (s instanceof Translation) {
return s.Clone() /* MUST CLONE HERE! */; return s.Clone() /* MUST CLONE HERE! */;

View file

@ -671,7 +671,7 @@
] ]
}, },
"location": [ "location": [
"point" "point", "centroid"
] ]
} }
] ]

View file

@ -202,7 +202,7 @@
"render": "40,40,center" "render": "40,40,center"
}, },
"location": [ "location": [
"point" "point","centroid"
] ]
} }
] ]

View file

@ -5,70 +5,29 @@
}, },
"minzoom": 12, "minzoom": 12,
"source": { "source": {
"osmTags": { "osmTags": "amenity=parking"
"and": [
{
"or": [
"amenity=parking",
"amenity=motorcycle_parking",
"amenity=bicycle_parking"
]
}
]
}
}, },
"title": { "title": {
"render": { "render": {
"nl": "Parking" "nl": "Autoparking",
}, "en": "Car parking"
"mappings": [
{
"if": "amenity=parking",
"then": {
"nl": "{name:nl}"
} }
}, },
{
"if": "amenity=motorcycle_parking",
"then": {
"nl": "{name}"
}
},
{
"if": "amenity=bicycle_parking",
"then": {
"nl": "Fietsenstalling"
}
}
]
},
"description": { "description": {
"nl": "Parking" "en": "A layer showing car parkings",
"nl": "Deze laag toont autoparkeerplaatsen"
}, },
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"presets": [ "presets": [
{
"tags": [
"amenity=bicycle_parking"
],
"title": {
"nl": "fietsparking"
},
"description": {
"nl": "Voeg hier een fietsenstalling toe"
}
},
{ {
"tags": [ "tags": [
"amenity=parking" "amenity=parking"
], ],
"title": { "title": {
"nl": "parking" "nl": "autoparking",
}, "en": "car parking"
"description": {
"nl": "Voeg hier een parking voor auto's toe"
} }
} }
], ],
@ -94,8 +53,13 @@
"render": "36,36,center" "render": "36,36,center"
}, },
"location": [ "location": [
"point" "point",
"centroid"
] ]
},
{
"width": 2,
"color": "#ddcc00"
} }
] ]
} }

View file

@ -106,9 +106,7 @@
], ],
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon" : "./assets/layers/play_forest/icon.svg",
"render": "./assets/layers/play_forest/icon.svg"
},
"iconSize": { "iconSize": {
"render": "40,40,center" "render": "40,40,center"
}, },
@ -118,12 +116,8 @@
] ]
}, },
{ {
"color": { "color": "#007055",
"render": "#007055" "width": "2"
},
"width": {
"render": "2"
}
} }
] ]
} }

View file

@ -506,7 +506,7 @@
"id~node/.*" "id~node/.*"
] ]
}, },
"then": "40,40,center" "then": "32,32,center"
}, },
{ {
"if": "_size_classification=small", "if": "_size_classification=small",
@ -514,13 +514,18 @@
}, },
{ {
"if": "_size_classification=large", "if": "_size_classification=large",
"then": "50,50,center" "then": "40,40,center"
} }
] ]
}, },
"location": [ "location": [
"point" "point","centroid"
] ]
},
{
"color": "#00cc00",
"width": "1",
"fill": "false"
} }
] ]
} }

View file

@ -224,7 +224,7 @@
"render": "40,40,center" "render": "40,40,center"
}, },
"location": [ "location": [
"point" "point","centroid"
] ]
} }
] ]
@ -332,7 +332,7 @@
"render": "40,40,center" "render": "40,40,center"
}, },
"location": [ "location": [
"point" "point","centroid"
] ]
} }
] ]
@ -1010,7 +1010,7 @@
{ {
"icon": "./assets/themes/climbing/climbing_unknown.svg", "icon": "./assets/themes/climbing/climbing_unknown.svg",
"location": [ "location": [
"point" "point","centroid"
] ]
}, },
{ {

View file

@ -68,8 +68,10 @@ Improve consistency of default fonts in all browsers. (https://github.com/sindre
*/ */
body { body {
font-family: system-ui, font-family:
-apple-system, /* Firefox supports this but not yet `system-ui` */ 'Segoe UI', system-ui,
-apple-system, /* Firefox supports this but not yet `system-ui` */
'Segoe UI',
Roboto, Roboto,
Helvetica, Helvetica,
Arial, Arial,
@ -127,7 +129,8 @@ code,
kbd, kbd,
samp, samp,
pre { pre {
font-family: ui-monospace, font-family:
ui-monospace,
SFMono-Regular, SFMono-Regular,
Consolas, Consolas,
'Liberation Mono', 'Liberation Mono',