Skip to content

Commit

Permalink
Merge pull request #4400 from openstreetmap/cam
Browse files Browse the repository at this point in the history
Allow cameras on a vertex
  • Loading branch information
bhousel authored Oct 6, 2017
2 parents 810c74f + 20e47a4 commit dd40dd5
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ en:
label: Handrail
hashtags:
# hashtags=*
label: Hashtags
label: Suggested Hashtags
# hashtags field placeholder
placeholder: '#example'
healthcare:
Expand Down
9 changes: 6 additions & 3 deletions data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -7385,7 +7385,8 @@
"highway/speed_camera": {
"icon": "attraction",
"geometry": [
"point"
"point",
"vertex"
],
"fields": [
"ref"
Expand Down Expand Up @@ -10015,7 +10016,8 @@
"man_made/surveillance_camera": {
"icon": "attraction",
"geometry": [
"point"
"point",
"vertex"
],
"fields": [
"surveillance",
Expand Down Expand Up @@ -10049,7 +10051,8 @@
"man_made/surveillance": {
"icon": "attraction",
"geometry": [
"point"
"point",
"vertex"
],
"fields": [
"surveillance",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets/highway/speed_camera.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"icon": "attraction",
"geometry": [
"point"
"point",
"vertex"
],
"fields": [
"ref"
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets/man_made/surveillance.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"icon": "attraction",
"geometry": [
"point"
"point",
"vertex"
],
"fields": [
"surveillance",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets/man_made/surveillance_camera.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"icon": "attraction",
"geometry": [
"point"
"point",
"vertex"
],
"fields": [
"surveillance",
Expand Down
2 changes: 1 addition & 1 deletion dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1592,7 +1592,7 @@
"label": "Handrail"
},
"hashtags": {
"label": "Hashtags",
"label": "Suggested Hashtags",
"placeholder": "#example"
},
"healthcare": {
Expand Down

0 comments on commit dd40dd5

Please sign in to comment.