CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'preset/surveillance_extended_fields_camera' of https://github.com/bkil/iD into bkil-preset/surveillance_extended_fields_camera

Browse Source
This commit is contained in:
Bryan Housel
2016-11-26 16:11:42 -05:00
parent cd1ac6ea59 c4140bf2b5
commit d2432ad96a
12 changed files with 177 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
data/presets.yaml
View File

@@ -206,6 +206,17 @@ en:
building_area:
# building=*
label: Building
camera/direction:
# 'camera:direction=*'
label: Camera direction
# camera/direction field placeholder
placeholder: 90 (degrees clockwise)
camera/mount:
# 'camera:mount=*'
label: Camera mount
camera/type:
# 'camera:type=*'
label: Camera type
capacity:
# capacity=*
label: Capacity
@@ -261,6 +272,11 @@ en:
construction:
# construction=*
label: Type
contact/webcam:
# 'contact:webcam=*'
label: Webcam feed URL
# contact/webcam field placeholder
placeholder: 'http://example.com/'
content:
# content=*
label: Contents
@@ -1070,6 +1086,15 @@ en:
surface:
# surface=*
label: Surface
surveillance:
# surveillance=*
label: Surveillance kind
surveillance/type:
# 'surveillance:type=*'
label: What is watching
surveillance/zone:
# 'surveillance:zone=*'
label: Zone
tactile_paving:
# tactile_paving=*
label: Tactile Paving

68
data/presets/fields.json
View File

@@ -283,6 +283,34 @@
"type": "combo",
"label": "Building"
},
"camera/direction": {
"key": "camera:direction",
"type": "number",
"label": "Camera direction",
"placeholder": "90 (degrees clockwise)"
},
"camera/mount": {
"key": "camera:mount",
"type": "combo",
"label": "Camera mount",
"options": [
"pole",
"wall",
"ceiling",
"roof",
"gantry"
]
},
"camera/type": {
"key": "camera:type",
"type": "combo",
"label": "Camera type",
"options": [
"fixed",
"panning",
"dome"
]
},
"capacity": {
"key": "capacity",
"type": "number",
@@ -335,6 +363,13 @@
"type": "combo",
"label": "Type"
},
"contact/webcam": {
"key": "contact:webcam",
"type": "url",
"icon": "website",
"label": "Webcam feed URL",
"placeholder": "http://example.com/"
},
"content": {
"key": "content",
"type": "combo",
@@ -1457,6 +1492,39 @@
"type": "combo",
"label": "Surface"
},
"surveillance": {
"key": "surveillance",
"type": "combo",
"label": "Surveillance kind",
"options": [
"outdoor",
"public",
"indoor"
]
},
"surveillance/type": {
"key": "surveillance:type",
"type": "combo",
"label": "What is watching",
"options": [
"camera",
"guard",
"alpr"
]
},
"surveillance/zone": {
"key": "surveillance:zone",
"type": "combo",
"label": "Zone",
"options": [
"traffic",
"building",
"town",
"parking",
"shop",
"bank"
]
},
"tactile_paving": {
"key": "tactile_paving",
"type": "check",

6
data/presets/fields/camera/direction.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "camera:direction",
"type": "number",
"label": "Camera direction",
"placeholder": "90 (degrees clockwise)"
}

6
data/presets/fields/camera/mount.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "camera:mount",
"type": "combo",
"label": "Camera mount",
"options": [ "pole", "wall", "ceiling", "roof", "gantry" ]
}

6
data/presets/fields/camera/type.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "camera:type",
"type": "combo",
"label": "Camera type",
"options": ["fixed", "panning", "dome"]
}

7
data/presets/fields/contact/webcam.json Normal file
View File

@@ -0,0 +1,7 @@
{
"key": "contact:webcam",
"type": "url",
"icon": "website",
"label": "Webcam feed URL",
"placeholder": "http://example.com/"
}

6
data/presets/fields/surveillance.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "surveillance",
"type": "combo",
"label": "Surveillance kind",
"options": ["outdoor", "public", "indoor"]
}

6
data/presets/fields/surveillance/type.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "surveillance:type",
"type": "combo",
"label": "What is watching",
"options": ["camera", "guard", "alpr"]
}

6
data/presets/fields/surveillance/zone.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "surveillance:zone",
"type": "combo",
"label": "Zone",
"options": ["traffic", "building", "town", "parking", "shop", "bank"]
}

9
data/presets/presets.json
View File

@@ -7049,6 +7049,15 @@
"geometry": [
"point"
],
"fields": [
"surveillance",
"surveillance/type",
"camera/type",
"camera/mount",
"camera/direction",
"surveillance/zone",
"contact/webcam"
],
"terms": [
"anpr",
"alpr",

9
data/presets/presets/man_made/surveillance.json
View File

@@ -3,6 +3,15 @@
"geometry": [
"point"
],
"fields": [
"surveillance",
"surveillance/type",
"camera/type",
"camera/mount",
"camera/direction",
"surveillance/zone",
"contact/webcam"
],
"terms": [
"anpr",
"alpr",

23
dist/locales/en.json vendored
View File

@@ -820,6 +820,16 @@
"building": {
"label": "Building"
},
"camera/direction": {
"label": "Camera direction",
"placeholder": "90 (degrees clockwise)"
},
"camera/mount": {
"label": "Camera mount"
},
"camera/type": {
"label": "Camera type"
},
"capacity": {
"label": "Capacity",
"placeholder": "50, 100, 200..."
@@ -858,6 +868,10 @@
"construction": {
"label": "Type"
},
"contact/webcam": {
"label": "Webcam feed URL",
"placeholder": "http://example.com/"
},
"content": {
"label": "Contents"
},
@@ -1536,6 +1550,15 @@
"surface": {
"label": "Surface"
},
"surveillance": {
"label": "Surveillance kind"
},
"surveillance/type": {
"label": "What is watching"
},
"surveillance/zone": {
"label": "Zone"
},
"tactile_paving": {
"label": "Tactile Paving"
},