Merge remote-tracking branch 'filbertkm/master' into styles

Conflicts:
	resources/map.js

8 files changed, 366 insertions, 2 deletions

diff --git a/resources/libs/locate/L.Control.Locate.css b/resources/libs/locate/L.Control.Locate.css
new file mode 100755
index 0000000..945732a
--- /dev/null
+++ b/resources/libs/locate/L.Control.Locate.css
@@ -0,0 +1,36 @@
+.leaflet-control-locate  {
+	height: 30px;
+}
+
+.leaflet-control-locate > div {
+    -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
+    border-radius: 7px;
+}
+.leaflet-control-locate > div {
+    padding: 5px;
+    background: rgba(0, 0, 0, 0.25);
+}
+.leaflet-control-locate a {
+    background-color: rgba(255, 255, 255, 0.75);
+}
+.leaflet-control-locate a{
+	background-image: url(images/locate.png);
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    display: block;
+}
+.leaflet-control-locate a {
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    width: 19px;
+    height: 19px;
+}
+.leaflet-control-locate a:hover {
+    background-color: #fff;
+}
+
+.leaflet-control-locate.active a {
+    background-image: url(images/locate_active.png);
+}
\ No newline at end of file
diff --git a/resources/libs/locate/L.Control.Locate.ie.css b/resources/libs/locate/L.Control.Locate.ie.css
new file mode 100755
index 0000000..fdbe9d0
--- /dev/null
+++ b/resources/libs/locate/L.Control.Locate.ie.css
@@ -0,0 +1,10 @@
+

+.leaflet-control-locate > div {

+	filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#3F000000',EndColorStr='#3F000000');

+}

+.leaflet-control-locate a {

+	background-color: #eee;

+}

+.leaflet-control-locate a:hover {

+    background-color: #fff;

+}

diff --git a/resources/libs/locate/L.Control.Locate.js b/resources/libs/locate/L.Control.Locate.js
new file mode 100755
index 0000000..b2ed522
--- /dev/null
+++ b/resources/libs/locate/L.Control.Locate.js
@@ -0,0 +1,171 @@
+L.Control.Locate = L.Control.extend({
+    options: {
+        position: 'topleft',
+        drawCircle: true,
+        follow: false,  // follow with zoom and pan the user's location
+        // range circle
+        circleStyle: {
+                color: '#136AEC',
+                fillColor: '#136AEC',
+                fillOpacity: 0.15,
+                weight: 2,
+                opacity: 0.5
+            },
+        // inner marker
+        markerStyle: {
+            color: '#136AEC',
+            fillColor: '#2A93EE',
+            fillOpacity: 0.7,
+            weight: 2,
+            opacity: 0.9,
+            radius: 4
+        },
+        debug: false
+    },
+
+    onAdd: function (map) {
+        var className = 'leaflet-control-locate',
+            classNames = className + " leaflet-control",
+            container = L.DomUtil.create('div', className);
+
+        var self = this;
+        var _map = map;
+        this._layer = new L.LayerGroup();
+        this._layer.addTo(_map);
+        this._event = undefined;
+        this._locateOptions = {
+            'setView': false,
+            'watch': true
+        };
+        this._locateOnNextLocationFound = true;
+        this._atLocation = false;
+        this._active = false;
+
+        var wrapper = L.DomUtil.create('div', className + "-wrap", container);
+        var link = L.DomUtil.create('a', className, wrapper);
+        link.href = '#';
+        link.title = 'Show me where I am';
+
+        var _log = function(data) {
+            if (self.options.debug) {
+                console.log(data);
+            }
+        };
+
+        L.DomEvent
+            .on(link, 'click', L.DomEvent.stopPropagation)
+            .on(link, 'click', L.DomEvent.preventDefault)
+            .on(link, 'click', function() {
+                _log('at location: ' + self._atLocation);
+                if (self._atLocation && self._active) {
+                    removeVisualization();
+                } else {
+                    self._active = true;
+                    self._locateOnNextLocationFound = true;
+                    if (!self._event) {
+                        map.locate(self._locateOptions);
+                    } else {
+                        visualizeLocation();
+                    }
+                }
+            })
+            .on(link, 'dblclick', L.DomEvent.stopPropagation);
+
+        var onLocationFound = function (e) {
+            _log('onLocationFound');
+
+            if (self._event &&
+                (self._event.latlng.lat != e.latlng.lat ||
+                 self._event.latlng.lon != e.latlng.lon)) {
+                _log('location has changed');
+                self._atLocation = false;
+            }
+
+            self._event = e;
+
+            if (!self._active) {
+                return;
+            }
+
+            if (self.options.follow) {
+                self._locateOnNextLocationFound = true;
+            }
+
+            visualizeLocation();
+        };
+
+        var visualizeLocation = function() {
+            _log('visualizeLocation,' + 'setView:' + self._locateOnNextLocationFound);
+
+            var radius = self._event.accuracy / 2;
+
+            if (self._locateOnNextLocationFound) {
+                self._map.fitBounds(self._event.bounds);
+                self._atLocation = true;
+                self._locateOnNextLocationFound = false;
+            }
+
+            self._layer.clearLayers();
+
+            // curcle with the radius of the location's accuracy
+            if (self.options.drawCircle) {
+                L.circle(self._event.latlng, radius, self.options.circleStyle)
+                    .addTo(self._layer);
+            }
+
+            // small inner marker
+            L.circleMarker(self._event.latlng, self.options.markerStyle)
+                .bindPopup("You are within " + radius.toFixed(0) + " meters from this point")
+                .addTo(self._layer);
+
+            if (!self._container)
+                return;
+            self._container.className = classNames + " active";
+        };
+
+        var removeVisualization = function() {
+            self._container.className = classNames;
+            self._active = false;
+
+            self._layer.clearLayers();
+        };
+
+        var onLocationError = function (err) {
+            _log('onLocationError');
+
+            // ignore timeout error if the location is watched
+            if (err.code==3 && this.options.locateOptions.watch) {
+                return;
+            }
+
+            map.stopLocate();
+            removeVisualization();
+            alert(err.message);
+        };
+
+        map.on('movestart', function() {
+            self._atLocation = false;
+        });
+
+        // event hooks
+        map.on('locationfound', onLocationFound, self);
+        map.on('locationerror', onLocationError, self);
+
+        if (this.options.autoLocate) {
+            map.locate(self._locateOptions);
+        }
+
+        return container;
+    }
+});
+
+L.Map.addInitHook(function () {
+    if (this.options.locateControl) {
+        this.locateControl = L.control.locate();
+        this.addControl(this.locateControl);
+    }
+});
+
+L.control.locate = function (options) {
+    return new L.Control.Locate(options);
+};
diff --git a/resources/libs/locate/LICENSE b/resources/libs/locate/LICENSE
new file mode 100755
index 0000000..e0d82f6
--- /dev/null
+++ b/resources/libs/locate/LICENSE
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2012 Dominik Moritz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/resources/libs/locate/images/locate.png b/resources/libs/locate/images/locate.png
new file mode 100755
index 0000000..9505daa
--- /dev/null
+++ b/resources/libs/locate/images/locate.png
diff --git a/resources/libs/locate/images/locate.svg b/resources/libs/locate/images/locate.svg
new file mode 100755
index 0000000..40ad2be
--- /dev/null
+++ b/resources/libs/locate/images/locate.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="12"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   inkscape:export-filename="/Users/dominik/Developer/JavaScript/Leaflet.locatecontrol/src/images/locate_active.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="locate.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3817">
+      <stop
+         style="stop-color:#00b1ff;stop-opacity:1;"
+         offset="0"
+         id="stop3819" />
+      <stop
+         style="stop-color:#7cf7ff;stop-opacity:1;"
+         offset="1"
+         id="stop3821" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3817"
+       id="linearGradient3823"
+       x1="6"
+       y1="8"
+       x2="6"
+       y2="4"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="1.6755728"
+     inkscape:cy="7.2132946"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="709"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1040.3622)">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3823);fill-opacity:1;stroke:none"
+       id="path3815"
+       sodipodi:cx="6"
+       sodipodi:cy="6"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="M 8,6 A 2,2 0 1 1 4,6 2,2 0 1 1 8,6 z"
+       transform="matrix(2.5,0,0,2.5,-9,1031.3622)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:1.79999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3786"
+       sodipodi:cx="6"
+       sodipodi:cy="6"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="M 12,6 A 6,6 0 1 1 0,6 6,6 0 1 1 12,6 z"
+       transform="matrix(0.83333333,0,0,0.83333333,1,1041.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3788"
+       width="3"
+       height="2"
+       x="1"
+       y="1045.3622" />
+    <rect
+       y="1045.3622"
+       x="8"
+       height="2"
+       width="3"
+       id="rect3790"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3792"
+       width="2"
+       height="3.0000174"
+       x="5"
+       y="1041.3622" />
+    <rect
+       y="1048.3622"
+       x="5"
+       height="2.9999826"
+       width="2"
+       id="rect3794"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/resources/libs/locate/images/locate_active.png b/resources/libs/locate/images/locate_active.png
new file mode 100755
index 0000000..f1a239f
--- /dev/null
+++ b/resources/libs/locate/images/locate_active.png
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) {