From d7aa5c136a383c231748c6a1094058f3d55fd19b Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 29 Jul 2016 10:37:43 -0400 Subject: [PATCH] thoroughly test partial fix of #6 --- tests/conversions.js | 21 ++++++++++++++++++++- tests/s2-node-hilbert.js | 8 ++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tests/conversions.js b/tests/conversions.js index 4a40737..3c3b346 100644 --- a/tests/conversions.js +++ b/tests/conversions.js @@ -1,5 +1,6 @@ 'use strict'; +var Long = require('long'); var s2node = require('s2geometry-node'); var S2 = require('../src/s2geometry.js').S2; @@ -52,5 +53,23 @@ tests.forEach(function (loc) { loc.lng = s2nId.toLatLng().toString().split(',')[1]; loc.level = s2nId.level(); // always 15 - console.log(JSON.stringify(loc, null, ' ')); + //console.log(JSON.stringify(loc, null, ' ')); + + var key = S2.latLngToQuadkey(loc.lat, loc.lng, level); + var id = S2.toId(key); + var key2 = S2.toKey(id); + var id2 = S2.toId(key2); + + if (loc.key !== key || loc.id !== id || loc.key !== key2 || loc.id !== id2) { + console.error("Error testing " + loc.name + " @ " + loc.lat + ',' + loc.lng); + console.error("Calculated/Expected:"); + console.error(id, ':', loc.id); + console.error(key, " : ", loc.key); + console.error(id2, ':', loc.id); + console.error(key2, " : ", loc.key); + console.error(Long.fromString(id, true, 10).toString(2)); + console.error(Long.fromString(loc.id, true, 10).toString(2)); + + throw new Error('Test Failed'); + } }); diff --git a/tests/s2-node-hilbert.js b/tests/s2-node-hilbert.js index 2fb903e..69ffdd3 100644 --- a/tests/s2-node-hilbert.js +++ b/tests/s2-node-hilbert.js @@ -9,8 +9,12 @@ var S2 = require('s2geometry-node'); //var lng = -111.6630927; // Kyderman's test location -var lat = 51.352085106718384; -var lng = -2.9877930879592896; +//var lat = 51.352085106718384; +//var lng = -2.9877930879592896; + +// Toeler's test location +var lat = -43.5261282; +var lng = 172.6561085; var s2latlng = new S2.S2LatLng(lat, lng); var cellId = new S2.S2CellId(s2latlng).parent(15);