Merge branch 'master' into develop
This commit is contained in:
commit
8fd4270545
2 changed files with 4 additions and 2 deletions
2
State.ts
2
State.ts
|
@ -22,7 +22,7 @@ export 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.0.8d";
|
public static vNumber = "0.0.8e";
|
||||||
|
|
||||||
// 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 = {
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
"and": [
|
"and": [
|
||||||
"cyclestreet=yes",
|
"cyclestreet=yes",
|
||||||
"maxspeed=30",
|
"maxspeed=30",
|
||||||
|
"overtaking:motor_vehicle=no",
|
||||||
"proposed:cyclestreet="
|
"proposed:cyclestreet="
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -64,7 +65,8 @@
|
||||||
"if": {
|
"if": {
|
||||||
"and": [
|
"and": [
|
||||||
"cyclestreet=",
|
"cyclestreet=",
|
||||||
"proposed:cyclestreet="
|
"proposed:cyclestreet=",
|
||||||
|
"overtaking:motor_vehicle="
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"then": {
|
"then": {
|
||||||
|
|
Loading…
Reference in a new issue