midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix associations

Browse source
This commit is contained in:
pietervdvn 2021-01-04 16:02:54 +01:00
parent c2a2306d18
commit cc48d34804
3 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Logic/MetaTagging.ts
View file

@ -6,10 +6,9 @@ import {Utils} from "../Utils";
import CountryCoder from "latlon2country" import CountryCoder from "latlon2country"
class SimpleMetaTagger { class SimpleMetaTagger {
private _f: (feature: any, index: number) => void;
public readonly keys: string[]; public readonly keys: string[];
public readonly doc: string; public readonly doc: string;
private _f: (feature: any, index: number) => void;
constructor(keys: string[], doc: string, f: ((feature: any, index: number) => void)) { constructor(keys: string[], doc: string, f: ((feature: any, index: number) => void)) {
this.keys = keys; this.keys = keys;
@ -89,7 +88,7 @@ export default class MetaTagging {
if (tags.opening_hours === undefined || tags._country === undefined) { if (tags.opening_hours === undefined || tags._country === undefined) {
return; return;
} }
try{ try {
const oh = new opening_hours(tags["opening_hours"], { const oh = new opening_hours(tags["opening_hours"], {
lat: tags._lat, lat: tags._lat,
@ -120,8 +119,8 @@ export default class MetaTagging {
} }
} }
updateTags(); updateTags();
}catch(e){ } catch (e) {
console.error(e); console.error("Error while parsing opening hours of ", tags.id, e);
tags["_isOpen"] = "parse_error"; tags["_isOpen"] = "parse_error";
} }
@ -250,16 +249,16 @@ export default class MetaTagging {
carWidthUsed + carWidthUsed +
cyclistWidthUsed + cyclistWidthUsed +
parallelParkingCount * carWidthUsed; parallelParkingCount * carWidthUsed;
properties["_width:needed:no_pedestrians"] =Utils.Round(targetWidthIgnoringPedestrians); properties["_width:needed:no_pedestrians"] = Utils.Round(targetWidthIgnoringPedestrians);
const pedestriansNeed = Math.max(0, pedestrianFlowNeeded) * pedestrianWidth; const pedestriansNeed = Math.max(0, pedestrianFlowNeeded) * pedestrianWidth;
const targetWidth = targetWidthIgnoringPedestrians + pedestriansNeed ; const targetWidth = targetWidthIgnoringPedestrians + pedestriansNeed;
properties["_width:needed"] = Utils.Round(targetWidth); properties["_width:needed"] = Utils.Round(targetWidth);
properties["_width:needed:pedestrians"] = Utils.Round(pedestriansNeed) properties["_width:needed:pedestrians"] = Utils.Round(pedestriansNeed)
properties["_width:difference"] = Utils.Round(targetWidth - width ); properties["_width:difference"] = Utils.Round(targetWidth - width);
properties["_width:difference:no_pedestrians"] = Utils.Round(targetWidthIgnoringPedestrians - width) ; properties["_width:difference:no_pedestrians"] = Utils.Round(targetWidthIgnoringPedestrians - width);
} }
); );

2
State.ts
View file

@ -25,7 +25,7 @@ export default class State {
// The singleton of the global state // The singleton of the global state
public static state: State; public static state: State;
public static vNumber = "0.2.6b"; public static vNumber = "0.2.6c";
// The user journey states thresholds when a new feature gets unlocked // The user journey states thresholds when a new feature gets unlocked
public static userJourney = { public static userJourney = {

6
assets/layers/cycling_themed_object/cycling_themed_objects.json
View file

@ -11,9 +11,9 @@
"or": [ "or": [
"theme~cycling|bicycle", "theme~cycling|bicycle",
"sport=cycling", "sport=cycling",
"association=cycling|bicycle", "association~cycling|bicycle",
"ngo=cycling|bicycle", "ngo~cycling|bicycle",
"club=bicycle|cycling" "club~bicycle|cycling"
] ]
}, },
"title": { "title": {