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

More work on widths

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-17 18:57:07 +02:00
parent 636bad97b3
commit c9e90935d8
3 changed files with 95 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

114
Customizations/Layers/Widths.ts
View file

@ -8,6 +8,7 @@ export class Widths extends LayerDefinition {
private cyclistWidth: number; private cyclistWidth: number;
private carWidth: number; private carWidth: number;
private pedestrianWidth: number;
private readonly _bothSideParking = new Tag("parking:lane:both", "parallel"); private readonly _bothSideParking = new Tag("parking:lane:both", "parallel");
private readonly _noSideParking = new Tag("parking:lane:both", "no_parking"); private readonly _noSideParking = new Tag("parking:lane:both", "no_parking");
@ -17,6 +18,13 @@ export class Widths extends LayerDefinition {
private readonly _rightSideParking = private readonly _rightSideParking =
new And([new Tag("parking:lane:right", "parallel"), new Tag("parking:lane:left", "no_parking")]); new And([new Tag("parking:lane:right", "parallel"), new Tag("parking:lane:left", "no_parking")]);
private _sidewalkBoth = new Tag("sidewalk", "both");
private _sidewalkLeft = new Tag("sidewalk", "left");
private _sidewalkRight = new Tag("sidewalk", "right");
private _sidewalkNone = new Tag("sidewalk", "none");
private readonly _oneSideParking = new Or([this._leftSideParking, this._rightSideParking]); private readonly _oneSideParking = new Or([this._leftSideParking, this._rightSideParking]);
private readonly _carfree = new Or([new Tag("highway", "pedestrian"), new Tag("highway", "living_street")]) private readonly _carfree = new Or([new Tag("highway", "pedestrian"), new Tag("highway", "living_street")])
@ -38,13 +46,25 @@ export class Widths extends LayerDefinition {
} }
let pedestrianFlowNeeded = 0;
if (this._sidewalkBoth.matchesProperties(properties)) {
pedestrianFlowNeeded = 0;
} else if (this._sidewalkNone.matchesProperties(properties)) {
pedestrianFlowNeeded = 2;
} else if (this._sidewalkLeft.matchesProperties(properties) || this._sidewalkRight.matches(properties)) {
pedestrianFlowNeeded = 1;
} else {
pedestrianFlowNeeded = -1;
}
let onewayCar = properties.oneway === "yes"; let onewayCar = properties.oneway === "yes";
let onewayBike = properties["oneway:bicycle"] === "yes" || let onewayBike = properties["oneway:bicycle"] === "yes" ||
(onewayCar && properties["oneway:bicycle"] === undefined) (onewayCar && properties["oneway:bicycle"] === undefined)
let carWidth = (onewayCar ? 1 : 2) * this.carWidth; let carWidth = (onewayCar ? 1 : 2) * this.carWidth;
let cyclistWidth = (onewayBike ? 1 : 2) * this.cyclistWidth; let cyclistWidth = (onewayBike ? 1 : 2) * this.cyclistWidth;
const width = parseFloat(properties["width:carriageway"]); const width = parseFloat(properties["width:carriageway"]);
@ -53,6 +73,7 @@ export class Widths extends LayerDefinition {
const targetWidth = const targetWidth =
carWidth + carWidth +
cyclistWidth + cyclistWidth +
Math.max(0, pedestrianFlowNeeded) * this.pedestrianWidth +
parallelParkingCount * this.carWidth; parallelParkingCount * this.carWidth;
return { return {
@ -60,16 +81,25 @@ export class Widths extends LayerDefinition {
parkingStateKnown: parkingStateKnown, parkingStateKnown: parkingStateKnown,
width: width, width: width,
targetWidth: targetWidth, targetWidth: targetWidth,
onewayBike: onewayBike onewayBike: onewayBike,
pedestrianFlowNeeded: pedestrianFlowNeeded,
} }
} }
constructor(carWidth: number, constructor(carWidth: number,
cyclistWidth: number) { cyclistWidth: number,
pedestrianWidth: number) {
super(); super();
this.carWidth = carWidth; this.carWidth = carWidth;
this.cyclistWidth = cyclistWidth; this.cyclistWidth = cyclistWidth;
this.pedestrianWidth = pedestrianWidth;
function r(n: number) {
const pre = Math.floor(n);
const post = Math.floor((n * 10) % 10);
return "" + pre + "." + post;
}
this.name = "widths"; this.name = "widths";
this.overpassFilter = new Tag("width:carriageway", "*"); this.overpassFilter = new Tag("width:carriageway", "*");
@ -85,18 +115,18 @@ export class Widths extends LayerDefinition {
const self = this; const self = this;
this.style = (properties) => { this.style = (properties) => {
let c = "#0c0"; let c = "#f00";
const props = self.calcProps(properties); const props = self.calcProps(properties);
if (props.pedestrianFlowNeeded > 0) {
if (props.width < props.targetWidth) { c = "#fa0"
c = "#f00"; }
if (props.width >= props.targetWidth) {
c = "#0c0";
} }
let dashArray = undefined; if (!props.parkingStateKnown && properties["note:width:carriageway"] === undefined) {
if (!props.parkingStateKnown) {
c = "#f0f" c = "#f0f"
} }
@ -104,14 +134,16 @@ export class Widths extends LayerDefinition {
c = "#aaa"; c = "#aaa";
} }
// Mark probably wrong data
if (props.width > 15) {
c = "#f0f"
}
let dashArray = undefined;
if (props.onewayBike) { if (props.onewayBike) {
dashArray = [20, 8] dashArray = [20, 8]
} }
if (props.width > 15) {
c = "#ffb72b"
}
return { return {
icon: null, icon: null,
color: c, color: c,
@ -122,28 +154,56 @@ export class Widths extends LayerDefinition {
this.elementsToShow = [ this.elementsToShow = [
new TagRenderingOptions({ new TagRenderingOptions({
question: "Mogen auto's hier parkeren?",
mappings: [ mappings: [
{ {
k: this._bothSideParking, k: this._bothSideParking,
txt: "Auto's kunnen langs beide zijden parkeren.<br+>Dit gebruikt <b>" + (this.carWidth * 2) + "m</b><br/>" txt: "Auto's kunnen langs beide zijden parkeren.<br+>Dit gebruikt <b>" + r(this.carWidth * 2) + "m</b><br/>"
}, },
{ {
k: this._oneSideParking, k: this._oneSideParking,
txt: "Auto's kunnen langs één kant parkeren.<br/>Dit gebruikt <b>" + this.carWidth + "m</b><br/>" txt: "Auto's kunnen langs één kant parkeren.<br/>Dit gebruikt <b>" + r(this.carWidth) + "m</b><br/>"
}, },
{k: this._noSideParking, txt: "Auto's mogen hier niet parkeren"}, {k: this._noSideParking, txt: "Auto's mogen hier niet parkeren"},
{k: null, txt: "Nog geen parkeerinformatie bekend"} // {k: null, txt: "Nog geen parkeerinformatie bekend"}
] ],
freeform: {
key: "note:width:carriageway",
renderTemplate: "{note:width:carriageway}",
template: "$$$",
}
}).OnlyShowIf(this._notCarFree), }).OnlyShowIf(this._notCarFree),
new TagRenderingOptions({
mappings: [
{
k: this._sidewalkNone,
txt: "Deze straat heeft geen voetpaden. Voetgangers hebben hier <b>" + r(this.pedestrianWidth * 2) + "m</b> nodig"
},
{
k: new Or([this._sidewalkLeft, this._sidewalkRight]),
txt: "Deze straat heeft een voetpad aan één kant. Voetgangers hebben hier <b>" + r(this.pedestrianWidth) + "m</b> nodig"
},
{k: this._sidewalkBoth, txt: "Deze straat heeft voetpad aan beide zijden."},
],
freeform: {
key: "note:width:carriageway",
renderTemplate: "{note:width:carriageway}",
template: "$$$",
}
}).OnlyShowIf(this._notCarFree),
new TagRenderingOptions({ new TagRenderingOptions({
mappings: [ mappings: [
{ {
k: new Tag("oneway:bicycle", "yes"), k: new Tag("oneway:bicycle", "yes"),
txt: "Eenrichtingsverkeer, óók voor fietsers. Dit gebruikt <b>" + (this.carWidth + this.cyclistWidth) + "m</b>" txt: "Eenrichtingsverkeer, óók voor fietsers. Dit gebruikt <b>" + r(this.carWidth + this.cyclistWidth) + "m</b>"
}, },
{ {
k: new And([new Tag("oneway", "yes"), new Tag("oneway:bicycle", "no")]), k: new And([new Tag("oneway", "yes"), new Tag("oneway:bicycle", "no")]),
txt: "Tweerichtingverkeer voor fietsers, eenrichting voor auto's Dit gebruikt <b>" + (this.carWidth + 2 * this.cyclistWidth) + "m</b>" txt: "Tweerichtingverkeer voor fietsers, eenrichting voor auto's Dit gebruikt <b>" + r(this.carWidth + 2 * this.cyclistWidth) + "m</b>"
}, },
{ {
k: new Tag("oneway", "yes"), k: new Tag("oneway", "yes"),
@ -151,7 +211,7 @@ export class Widths extends LayerDefinition {
}, },
{ {
k: null, k: null,
txt: "Tweerichtingsverkeer voor iedereen. Dit gebruikt <b>" + (2 * this.carWidth + 2 * this.cyclistWidth) + "m</b>" txt: "Tweerichtingsverkeer voor iedereen. Dit gebruikt <b>" + r(2 * this.carWidth + 2 * this.cyclistWidth) + "m</b>"
} }
] ]
}).OnlyShowIf(this._notCarFree), }).OnlyShowIf(this._notCarFree),
@ -160,12 +220,16 @@ export class Widths extends LayerDefinition {
{ {
tagsPreprocessor: (tags) => { tagsPreprocessor: (tags) => {
const props = self.calcProps(tags); const props = self.calcProps(tags);
tags.targetWidth = props.targetWidth; tags.targetWidth = r(props.targetWidth);
console.log("PREP", tags) tags.short = "";
if (props.width < props.targetWidth) {
tags.short = "Er is dus <b class='alert'>" + r(props.targetWidth - props.width) + "m</b> te weinig"
}
}, },
freeform: { freeform: {
key: "width:carriageway", key: "width:carriageway",
renderTemplate: "De totale nodige ruimte voor vlot en veilig verkeer is dus <b>{targetWidth}m</b>.", renderTemplate: "De totale nodige ruimte voor vlot en veilig verkeer is dus <b>{targetWidth}m</b><br>" +
"{short}",
template: "$$$", template: "$$$",
} }
} }

5
Customizations/Layouts/StreetWidth.ts
View file

@ -9,8 +9,9 @@ export class StreetWidth extends Layout{
super( "width", super( "width",
"Straatbreedtes in Brugge", "Straatbreedtes in Brugge",
[new Widths( [new Widths(
2.2, 2.0,
1.5 1.5,
0.75
)], )],
15, 15,

4
index.ts
View file

@ -41,7 +41,7 @@ if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
dryRun = true; dryRun = true;
// If you have a testfile somewhere, enable this to spoof overpass // If you have a testfile somewhere, enable this to spoof overpass
// This should be hosted independantly, e.g. with `cd assets; webfsd -p 8080` + a CORS plugin to disable cors rules // This should be hosted independantly, e.g. with `cd assets; webfsd -p 8080` + a CORS plugin to disable cors rules
Overpass.testUrl = "http://127.0.0.1:8080/streetwidths.geojson"; //Overpass.testUrl = "http://127.0.0.1:8080/streetwidths.geojson";
} }
@ -80,7 +80,7 @@ if (paramDict.layout) {
} }
if (paramDict.test) { if (paramDict.test) {
dryRun = true; dryRun = paramDict.test === "true";
} }
const layoutToUse = AllKnownLayouts.allSets[defaultLayout]; const layoutToUse = AllKnownLayouts.allSets[defaultLayout];