From b2b5e60f876312777ad15482f937ec3d8d81fe45 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 27 Feb 2014 11:48:02 +0100 Subject: [PATCH] Remove unused ol.format.Polyline.decodeFloat function --- src/ol/format/polylineformat.js | 14 ------------ test/spec/ol/format/polylineformat.test.js | 26 +++++++++++----------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/ol/format/polylineformat.js b/src/ol/format/polylineformat.js index adf8ea65fc..764e523bff 100644 --- a/src/ol/format/polylineformat.js +++ b/src/ol/format/polylineformat.js @@ -252,20 +252,6 @@ ol.format.Polyline.encodeFloat = function(num, opt_factor) { }; -/** - * Decode one single floating point number from an encoded string - * - * @param {string} encoded An encoded string. - * @param {number=} opt_factor The factor by which the result will be divided. - * @return {number} The decoded floating point number. - */ -ol.format.Polyline.decodeFloat = function(encoded, opt_factor) { - var factor = goog.isDef(opt_factor) ? opt_factor : 1e5; - var result = ol.format.Polyline.decodeSignedInteger(encoded); - return result / factor; -}; - - /** * Encode one single signed integer and return an encoded string * diff --git a/test/spec/ol/format/polylineformat.test.js b/test/spec/ol/format/polylineformat.test.js index ac137aa19f..52215a49b9 100644 --- a/test/spec/ol/format/polylineformat.test.js +++ b/test/spec/ol/format/polylineformat.test.js @@ -163,24 +163,24 @@ describe('ol.format.Polyline', function() { describe('decodeFloat', function() { it('returns expected value', function() { - var decodeFloat = ol.format.Polyline.decodeFloat; + var decodeFloats = ol.format.Polyline.decodeFloats; - expect(decodeFloat('?')).to.eql(0.00000); - expect(decodeFloat('@')).to.eql(-0.00001); - expect(decodeFloat('A')).to.eql(0.00001); - expect(decodeFloat('B')).to.eql(-0.00002); - expect(decodeFloat('C')).to.eql(0.00002); - expect(decodeFloat(']')).to.eql(0.00015); - expect(decodeFloat('^')).to.eql(-0.00016); + expect(decodeFloats('?')).to.eql([0.00000]); + expect(decodeFloats('@')).to.eql([-0.00001]); + expect(decodeFloats('A')).to.eql([0.00001]); + expect(decodeFloats('B')).to.eql([-0.00002]); + expect(decodeFloats('C')).to.eql([0.00002]); + expect(decodeFloats(']')).to.eql([0.00015]); + expect(decodeFloats('^')).to.eql([-0.00016]); - expect(decodeFloat('@', 10)).to.eql(-0.1); - expect(decodeFloat('A', 10)).to.eql(0.1); + expect(decodeFloats('@', 10)).to.eql([-0.1]); + expect(decodeFloats('A', 10)).to.eql([0.1]); - expect(decodeFloat('__@')).to.eql(16 * 32 / 1e5); - expect(decodeFloat('___@')).to.eql(16 * 32 * 32 / 1e5); + expect(decodeFloats('__@')).to.eql([16 * 32 / 1e5]); + expect(decodeFloats('___@')).to.eql([16 * 32 * 32 / 1e5]); // from the "Encoded Polyline Algorithm Format" page at Google - expect(decodeFloat('`~oia@')).to.eql(-179.98321); + expect(decodeFloats('`~oia@')).to.eql([-179.98321]); }); });