Merge branch 'three' of https://github.com/tschaub/openlayers into three

Conflicts:
	src/api/loc.js
	src/api/map.js
	src/ol/Map.js
This commit is contained in:
Mike Adair
2012-06-19 09:04:04 -04:00
7 changed files with 65 additions and 102 deletions

View File

@@ -63,8 +63,8 @@ describe("ol.Map", function() {
center = map.center();
zoom = map.zoom();
expect(center.x().toFixed(3)).toBe("4.000");
expect(center.y().toFixed(3)).toBe("5.000");
expect(center.x().toFixed(3)).toBe("1.000");
expect(center.y().toFixed(3)).toBe("2.000");
expect(zoom).toBe(6);
});