CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-12 16:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Tom MacWright
2012-11-13 21:23:23 -05:00
parent 611c4584d9
commit 4bc8313157
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/iD/renderer/Map.js
View File

@@ -76,10 +76,6 @@ iD.Map = function(elem) {
// strokes, and so on.
var surface = parent.append('svg')
.call(zoombehavior);
// .call(clickCancel);
// Don't use the default double click handler.
// surface.on('dblclick.zoom', null);
surface.append('defs').append('clipPath')
.attr('id', 'clip')
@@ -326,8 +322,7 @@ iD.Map = function(elem) {
}
function getZoom(zoom) {
var s = projection.scale();
return Math.max(Math.log(s) / Math.log(2) - 7, 0);
return Math.max(Math.log(projection.scale()) / Math.log(2) - 7, 0);
}
function setZoom(zoom) {

4
test/index.html
View File

@@ -14,6 +14,7 @@
<script type="text/javascript" src="../js/lib/d3.v2.min.js"></script>
<script type="text/javascript" src="../js/iD/id.js"></script>
<script type="text/javascript" src="../js/iD/Util.js"></script>
<script type="text/javascript" src="../js/iD/format/format.js"></script>
<script type="text/javascript" src="../js/iD/format/GeoJSON.js"></script>
<script type="text/javascript" src="../js/iD/Connection.js"></script>
@@ -26,7 +27,8 @@
<script type="text/javascript" src="../js/iD/renderer/Map.js"></script>
<script type="text/javascript" src="../js/iD/renderer/Style.js"></script>
<script type="text/javascript" src="../js/iD/renderer/tiles.js"></script>
<script type="text/javascript" src="../js/iD/Graph.js"></script>
<script type="text/javascript" src="../js/iD/graph/Graph.js"></script>
<script type="text/javascript" src="../js/iD/graph/History.js"></script>
<!-- include spec files here... -->
<script type="text/javascript" src="spec/Util.js"></script>

4
test/spec/GeoJSON.js
View File

@@ -2,11 +2,11 @@ describe('GeoJSON', function() {
describe('#mapping', function() {
it('should be able to map a node to geojson', function() {
expect(iD.GeoJSON.mapping({ type: 'node', lat: 38, lon: -77 }).geometry.type).toEqual('Point');
expect(iD.format.GeoJSON.mapping({ type: 'node', lat: 38, lon: -77 }).geometry.type).toEqual('Point');
});
it('should be able to map a way to geojson', function() {
var way = { type: 'way', nodes: [] };
var gj = iD.GeoJSON.mapping(way);
var gj = iD.format.GeoJSON.mapping(way);
expect(gj.type).toEqual('Feature');
expect(gj.geometry.type).toEqual('LineString');
});

2
test/spec/Way.js
View File

@@ -2,7 +2,7 @@ describe('Way', function() {
var way;
beforeEach(function() {
way = { type: 'way', nodes: ['n1', 'n2'] };
way = { type: 'way', nodes: [{id: 'n1'}, {id: 'n2'}] };
});