CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-28 22:56:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to temaki 1.6.0, use security_camera icon

Browse Source 
(closes #6596)
This commit is contained in:
Bryan Housel
2019-06-30 08:53:53 -04:00
parent 03a098a181
commit 475ccc30bb
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets/presets.json
+3 -3
View File
@@ -508,7 +508,7 @@
"highway/service/emergency_access": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "emergency_access"}, "addTags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"},
"highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "parking_aisle"}, "addTags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
"highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
"highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
"highway/speed_camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
"highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "handrail", "step_count", "surface", "lit", "width"], "moreFields": ["covered", "dog", "indoor"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
"highway/steps/conveying": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
"highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
@@ -718,8 +718,8 @@
"man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
"man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"},
"man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"},
"man_made/surveillance": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
"man_made/surveillance/camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
"man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
"man_made/surveillance/camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
"man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"},
"man_made/torii": {"icon": "temaki-shinto", "fields": ["height", "material", "colour", "lit"], "moreFields": ["name", "operator", "ref"], "geometry": ["point", "vertex", "line"], "terms": ["Japanese gate", "Shinto shrine"], "tags": {"man_made": "torii"}, "name": "Torii"},
"man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
data/presets/presets/highway/speed_camera.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-attraction",
"icon": "temaki-security_camera",
"geometry": [
"point",
"vertex"
data/presets/presets/man_made/surveillance.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-attraction",
"icon": "temaki-security_camera",
"geometry": [
"point",
"vertex"
data/presets/presets/man_made/surveillance/camera.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-attraction",
"icon": "temaki-security_camera",
"geometry": [
"point",
"vertex"
data/taginfo.json
+3 -3
View File
@@ -489,7 +489,7 @@
{"key": "service", "value": "emergency_access", "description": "🄿 Emergency Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true"},
{"key": "service", "value": "parking_aisle", "description": "🄿 Parking Aisle", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true"},
{"key": "highway", "value": "services", "description": "🄿 Service Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
{"key": "highway", "value": "speed_camera", "description": "🄿 Speed Camera", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
{"key": "highway", "value": "speed_camera", "description": "🄿 Speed Camera", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/security_camera.svg?sanitize=true"},
{"key": "highway", "value": "steps", "description": "🄿 Steps", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-steps.svg?sanitize=true"},
{"key": "highway", "value": "stop", "description": "🄿 Stop Sign", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/stop.svg?sanitize=true"},
{"key": "highway", "value": "street_lamp", "description": "🄿 Street Lamp", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/bulb.svg?sanitize=true"},
@@ -691,8 +691,8 @@
{"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
{"key": "content", "value": "water", "description": "🄿 Water Tank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
{"key": "man_made", "value": "street_cabinet", "description": "🄿 Street Cabinet", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-door-closed.svg?sanitize=true"},
{"key": "man_made", "value": "surveillance", "description": "🄿 Surveillance", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
{"key": "surveillance:type", "value": "camera", "description": "🄿 Surveillance Camera, 🄵 Surveillance Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
{"key": "man_made", "value": "surveillance", "description": "🄿 Surveillance", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/security_camera.svg?sanitize=true"},
{"key": "surveillance:type", "value": "camera", "description": "🄿 Surveillance Camera, 🄵 Surveillance Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/security_camera.svg?sanitize=true"},
{"key": "man_made", "value": "survey_point", "description": "🄿 Survey Point", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"},
{"key": "man_made", "value": "torii", "description": "🄿 Torii", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/shinto.svg?sanitize=true"},
{"key": "man_made", "value": "tower", "description": "🄿 Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"},
package.json
+1 -1
View File
@@ -95,7 +95,7 @@
"smash": "0.0",
"static-server": "^2.2.1",
"svg-sprite": "1.5.0",
"temaki": "1.5.0",
"temaki": "1.6.0",
"uglify-js": "~3.6.0"
},
"greenkeeper": {