forked from MapComplete/MapComplete
Merge branches
This commit is contained in:
commit
722493cf9c
4 changed files with 14 additions and 6 deletions
|
@ -126,6 +126,13 @@
|
||||||
"de": "Zebrastreifen"
|
"de": "Zebrastreifen"
|
||||||
},
|
},
|
||||||
"hideInAnswer": true
|
"hideInAnswer": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"if": "crossing=unmarked",
|
||||||
|
"then": {
|
||||||
|
"en": "Crossing without crossing markings",
|
||||||
|
"nl": "Oversteekplaats zonder kruispuntmarkeringen"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
@ -2169,6 +2169,9 @@
|
||||||
},
|
},
|
||||||
"2": {
|
"2": {
|
||||||
"then": "Zebra crossing"
|
"then": "Zebra crossing"
|
||||||
|
},
|
||||||
|
"3": {
|
||||||
|
"then": "Crossing without crossing markings"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"question": "What kind of crossing is this?"
|
"question": "What kind of crossing is this?"
|
||||||
|
@ -3371,11 +3374,6 @@
|
||||||
"render": "Note"
|
"render": "Note"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"note_import": {
|
|
||||||
"title": {
|
|
||||||
"render": "Possible feature"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"observation_tower": {
|
"observation_tower": {
|
||||||
"description": "Towers with a panoramic view",
|
"description": "Towers with a panoramic view",
|
||||||
"name": "Observation towers",
|
"name": "Observation towers",
|
||||||
|
|
|
@ -2180,6 +2180,9 @@
|
||||||
},
|
},
|
||||||
"2": {
|
"2": {
|
||||||
"then": "Zebrapad"
|
"then": "Zebrapad"
|
||||||
|
},
|
||||||
|
"3": {
|
||||||
|
"then": "Oversteekplaats zonder kruispuntmarkeringen"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"question": "Wat voor oversteekplaats is dit?"
|
"question": "Wat voor oversteekplaats is dit?"
|
||||||
|
|
|
@ -14,7 +14,7 @@ npm run generate &&
|
||||||
npm run test &&
|
npm run test &&
|
||||||
npm run generate:layouts
|
npm run generate:layouts
|
||||||
|
|
||||||
if [ $? -ne 0]; then;
|
if [ $? -ne 0 ]; then
|
||||||
echo "ERROR"
|
echo "ERROR"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue