From e777e1a7222094f4e30e30361a289ca2358e7cc3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 3 Oct 2016 16:27:25 +0200 Subject: [PATCH] Sync default maxLevel with default ZoomButton.maxZoom (#1057) --- web/client/components/mapcontrols/scale/ScaleBox.jsx | 2 +- .../components/mapcontrols/scale/__tests__/ScaleBox-test.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/components/mapcontrols/scale/ScaleBox.jsx b/web/client/components/mapcontrols/scale/ScaleBox.jsx index 6c447d4fe9..dee41d1561 100644 --- a/web/client/components/mapcontrols/scale/ScaleBox.jsx +++ b/web/client/components/mapcontrols/scale/ScaleBox.jsx @@ -25,7 +25,7 @@ var ScaleBox = React.createClass({ getDefaultProps() { return { id: 'mapstore-scalebox', - scales: mapUtils.getGoogleMercatorScales(0, 21), + scales: mapUtils.getGoogleMercatorScales(0, 28), currentZoomLvl: 0, onChange() {}, readOnly: false, diff --git a/web/client/components/mapcontrols/scale/__tests__/ScaleBox-test.jsx b/web/client/components/mapcontrols/scale/__tests__/ScaleBox-test.jsx index 3b26eb38d6..efac85f0bc 100644 --- a/web/client/components/mapcontrols/scale/__tests__/ScaleBox-test.jsx +++ b/web/client/components/mapcontrols/scale/__tests__/ScaleBox-test.jsx @@ -31,7 +31,7 @@ describe('ScaleBox', () => { expect(domNode.id).toBe('mapstore-scalebox'); const comboItems = Array.prototype.slice.call(domNode.getElementsByTagName('option'), 0); - expect(comboItems.length).toBe(22); + expect(comboItems.length).toBe(29); expect(comboItems.reduce((pre, cur, i) => { const scale = parseInt(cur.innerHTML.replace(/1\s\:\s/i, ''), 10);