diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-12-03 00:53:46 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-12-03 00:53:46 +0000 |
commit | e576e8a4581061c906de7514b5dc814857d53c31 (patch) | |
tree | 4fda7331f381339a7c6fc7735c50c1b927bad8d5 /resources/map.js | |
parent | 31c7018ca59477b6e9653902b4d8806120a223c3 (diff) | |
parent | 0a0124ee79fae4a96d1d3fb6d0f054d0f17226cd (diff) | |
download | health-map-e576e8a4581061c906de7514b5dc814857d53c31.tar health-map-e576e8a4581061c906de7514b5dc814857d53c31.tar.gz |
Merge remote-tracking branch 'filbertkm/master' into styles
Conflicts:
resources/map.js
Diffstat (limited to 'resources/map.js')
-rw-r--r-- | resources/map.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/resources/map.js b/resources/map.js index ac9a506..9cc9471 100644 --- a/resources/map.js +++ b/resources/map.js @@ -35,6 +35,8 @@ $(document).ready(function() { }); GlobalMap = map; + L.control.locate().addTo(map); + function createQueryData(bbox) { // TODO: Use POST instead of GET, for neatness return "data=[out:json];(" + @@ -134,11 +136,10 @@ $(document).ready(function() { if (isHierarchical.exec(key)) { key = key.split(':')[1]; } - if (!_.contains(self.hospitalAttributes, key) && isBoolean(val)) { + if ((!_.contains(self.hospitalAttributes, key)) && isBoolean(val)) { self.hospitalAttributes.push(key); } }); - self.hospitalAttributes; } function onLocationFound(e) { |