Merge pull request #94 from arusahni/update-geohash-library

Switch to an NPM-available version of the GeoHash library.

bower.json

@@ -16,7 +16,7 @@
   "dependencies": {
     "jsts": "https://github.com/bjornharrtell/jsts",
     "leaflet": "~0.7.3",
-    "geohash-js": "git://github.com/thurmda/geohash-js",
+    "geohash-js": "git://github.com/voodootikigod/geohash-js",
     "underscore": "~1.6.0",
     "moment": "~2.8.1"
   }

dist/leaflet-dvf.js

@@ -4923,7 +4923,7 @@ L.LocationModes = {
 	 */
 	GEOHASH: function (record, index) {
 		var geohash = this.options.geohashField ? L.Util.getFieldValue(record, this.options.geohashField) : index;
-		var locationInfo = decodeGeoHash(geohash);
+		var locationInfo = GeoHash.decodeGeoHash(geohash);
 		var bounds;
 
 		if (locationInfo.latitude[2] && locationInfo.longitude[2]) {

examples/lib/geohash.js

@@ -1,112 +1,124 @@
 // geohash.js
 // Geohash library for Javascript
 // (c) 2008 David Troy
+// (c) 2010 Chris Williams
 // Distributed under the MIT License
 
-BITS = [16, 8, 4, 2, 1];
-
-BASE32 = 											   "0123456789bcdefghjkmnpqrstuvwxyz";
-NEIGHBORS = { right  : { even :  "bc01fg45238967deuvhjyznpkmstqrwx" },
-							left   : { even :  "238967debc01fg45kmstqrwxuvhjyznp" },
-							top    : { even :  "p0r21436x8zb9dcf5h7kjnmqesgutwvy" },
-							bottom : { even :  "14365h7k9dcfesgujnmqp0r2twvyx8zb" } };
-BORDERS   = { right  : { even : "bcfguvyz" },
-							left   : { even : "0145hjnp" },
-							top    : { even : "prxz" },
-							bottom : { even : "028b" } };
-
-NEIGHBORS.bottom.odd = NEIGHBORS.left.even;
-NEIGHBORS.top.odd = NEIGHBORS.right.even;
-NEIGHBORS.left.odd = NEIGHBORS.bottom.even;
-NEIGHBORS.right.odd = NEIGHBORS.top.even;
-
-BORDERS.bottom.odd = BORDERS.left.even;
-BORDERS.top.odd = BORDERS.right.even;
-BORDERS.left.odd = BORDERS.bottom.even;
-BORDERS.right.odd = BORDERS.top.even;
-
-function refine_interval(interval, cd, mask) {
-	if (cd&mask)
-		interval[0] = (interval[0] + interval[1])/2;
-  else
-		interval[1] = (interval[0] + interval[1])/2;
-}
-
-function calculateAdjacent(srcHash, dir) {
-	srcHash = srcHash.toLowerCase();
-	var lastChr = srcHash.charAt(srcHash.length-1);
-	var type = (srcHash.length % 2) ? 'odd' : 'even';
-	var base = srcHash.substring(0,srcHash.length-1);
-	if (BORDERS[dir][type].indexOf(lastChr)!=-1)
-		base = calculateAdjacent(base, dir);
-	return base + BASE32[NEIGHBORS[dir][type].indexOf(lastChr)];
-}
-
-function decodeGeoHash(geohash) {
-	var is_even = 1;
-	var lat = []; var lon = [];
-	lat[0] = -90.0;  lat[1] = 90.0;
-	lon[0] = -180.0; lon[1] = 180.0;
-	lat_err = 90.0;  lon_err = 180.0;
-
-	for (i=0; i<geohash.length; i++) {
-		c = geohash[i];
-		cd = BASE32.indexOf(c);
-		for (j=0; j<5; j++) {
-			mask = BITS[j];
-			if (is_even) {
-				lon_err /= 2;
-				refine_interval(lon, cd, mask);
-			} else {
-				lat_err /= 2;
-				refine_interval(lat, cd, mask);
-			}
-			is_even = !is_even;
-		}
-	}
-	lat[2] = (lat[0] + lat[1])/2;
-	lon[2] = (lon[0] + lon[1])/2;
-
-	return { latitude: lat, longitude: lon};
-}
-
-function encodeGeoHash(latitude, longitude) {
-	var is_even=1;
-	var i=0;
-	var lat = []; var lon = [];
-	var bit=0;
-	var ch=0;
-	var precision = 12;
-	geohash = "";
-
-	lat[0] = -90.0;  lat[1] = 90.0;
-	lon[0] = -180.0; lon[1] = 180.0;
-
-	while (geohash.length < precision) {
-	  if (is_even) {
-			mid = (lon[0] + lon[1]) / 2;
-	    if (longitude > mid) {
-				ch |= BITS[bit];
-				lon[0] = mid;
-	    } else
-				lon[1] = mid;
-	  } else {
-			mid = (lat[0] + lat[1]) / 2;
-	    if (latitude > mid) {
-				ch |= BITS[bit];
-				lat[0] = mid;
-	    } else
-				lat[1] = mid;
-	  }
-
-		is_even = !is_even;
-	  if (bit < 4)
-			bit++;
-	  else {
-			geohash += BASE32[ch];
-			bit = 0;
-			ch = 0;
-	  }
-	}
-	return geohash;
-}
+
+var GeoHash = (function () {
+  BITS = [16, 8, 4, 2, 1];
+
+  BASE32 =                         "0123456789bcdefghjkmnpqrstuvwxyz";
+  NEIGHBORS = { right  : { even :  "bc01fg45238967deuvhjyznpkmstqrwx" },
+                left   : { even :  "238967debc01fg45kmstqrwxuvhjyznp" },
+                top    : { even :  "p0r21436x8zb9dcf5h7kjnmqesgutwvy" },
+                bottom : { even :  "14365h7k9dcfesgujnmqp0r2twvyx8zb" } };
+  BORDERS   = { right  : { even : "bcfguvyz" },
+                left   : { even : "0145hjnp" },
+                top    : { even : "prxz" },
+                bottom : { even : "028b" } };
+
+  NEIGHBORS.bottom.odd = NEIGHBORS.left.even;
+  NEIGHBORS.top.odd = NEIGHBORS.right.even;
+  NEIGHBORS.left.odd = NEIGHBORS.bottom.even;
+  NEIGHBORS.right.odd = NEIGHBORS.top.even;
+
+  BORDERS.bottom.odd = BORDERS.left.even;
+  BORDERS.top.odd = BORDERS.right.even;
+  BORDERS.left.odd = BORDERS.bottom.even;
+  BORDERS.right.odd = BORDERS.top.even;
+
+  var refine_interval = function (interval, cd, mask) {
+    if (cd&mask)
+      interval[0] = (interval[0] + interval[1])/2;
+    else
+      interval[1] = (interval[0] + interval[1])/2;
+  };
+
+
+
+
+
+  return {
+    encodeGeoHash: function (latitude, longitude) {
+      var is_even=1;
+      var i=0;
+      var lat = []; var lon = [];
+      var bit=0;
+      var ch=0;
+      var precision = 12;
+      geohash = "";
+
+      lat[0] = -90.0;  lat[1] = 90.0;
+      lon[0] = -180.0; lon[1] = 180.0;
+
+      while (geohash.length < precision) {
+        if (is_even) {
+          mid = (lon[0] + lon[1]) / 2;
+          if (longitude > mid) {
+            ch |= BITS[bit];
+            lon[0] = mid;
+          } else
+            lon[1] = mid;
+        } else {
+          mid = (lat[0] + lat[1]) / 2;
+          if (latitude > mid) {
+            ch |= BITS[bit];
+            lat[0] = mid;
+          } else
+            lat[1] = mid;
+        }
+
+        is_even = !is_even;
+        if (bit < 4)
+          bit++;
+        else {
+          geohash += BASE32[ch];
+          bit = 0;
+          ch = 0;
+        }
+      }
+      return geohash;
+    },
+    decodeGeoHash: function (geohash) {
+      var is_even = 1;
+      var lat = []; var lon = [];
+      lat[0] = -90.0;  lat[1] = 90.0;
+      lon[0] = -180.0; lon[1] = 180.0;
+      lat_err = 90.0;  lon_err = 180.0;
+
+      for (i=0; i<geohash.length; i++) {
+        c = geohash[i];
+        cd = BASE32.indexOf(c);
+        for (j=0; j<5; j++) {
+          mask = BITS[j];
+          if (is_even) {
+            lon_err /= 2;
+            refine_interval(lon, cd, mask);
+          } else {
+            lat_err /= 2;
+            refine_interval(lat, cd, mask);
+          }
+          is_even = !is_even;
+        }
+      }
+      lat[2] = (lat[0] + lat[1])/2;
+      lon[2] = (lon[0] + lon[1])/2;
+
+      return { latitude: lat, longitude: lon};
+    },
+    calculateAdjacent: function (srcHash, dir) {
+      srcHash = srcHash.toLowerCase();
+      var lastChr = srcHash.charAt(srcHash.length-1);
+      var type = (srcHash.length % 2) ? 'odd' : 'even';
+      var base = srcHash.substring(0,srcHash.length-1);
+      if (BORDERS[dir][type].indexOf(lastChr)!=-1)
+        base = calculateAdjacent(base, dir);
+      return base + BASE32[NEIGHBORS[dir][type].indexOf(lastChr)];
+    }
+  };
+})();
+
+if (typeof exports == "undefined") { exports = {}; }
+
+exports.GeoHash = GeoHash;

package.json

@@ -38,5 +38,8 @@
       ]
     }
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "geohash": "0.0.1"
+  }
 }

src/leaflet.dvf.datalayer.js

@@ -44,7 +44,7 @@ L.LocationModes = {
 	 */
 	GEOHASH: function (record, index) {
 		var geohash = this.options.geohashField ? L.Util.getFieldValue(record, this.options.geohashField) : index;
-		var locationInfo = decodeGeoHash(geohash);
+		var locationInfo = GeoHash.decodeGeoHash(geohash);
 		var bounds;
 
 		if (locationInfo.latitude[2] && locationInfo.longitude[2]) {