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

added simple tests for loading and retrieving notes

Browse Source
This commit is contained in:
Thomas Hervey
2018-07-16 10:54:40 -04:00
parent 7fb42ac9d6
commit 7ad765d408
3 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/services/osm.js
View File

@@ -956,6 +956,15 @@ export default {
};
}
// access caches directly for testing (e.g., loading notes rtree)
if (obj === 'get') {
return {
tile: _tileCache,
note: _noteCache,
user: _userCache
};
}
if (obj.tile) {
_tileCache = obj.tile;
_tileCache.inflight = {};

1
test/index.html
View File

@@ -116,7 +116,6 @@
<script src='spec/svg/layers.js'></script>
<script src='spec/svg/lines.js'></script>
<script src='spec/svg/midpoints.js'></script>
<script src='spec/svg/notes.js'></script>
<script src='spec/svg/osm.js'></script>
<script src='spec/svg/points.js'></script>
<script src='spec/svg/svg.js'></script>

51
test/spec/services/osm.js
View File

@@ -137,7 +137,7 @@ describe('iD.serviceOsm', function () {
});
describe('#loadFromAPI', function () {
var path = '/aapi/0.6/map?bbox=-74.542,40.655,-74.541,40.656';
var path = '/api/0.6/map?bbox=-74.542,40.655,-74.541,40.656';
var response = '<?xml version="1.0" encoding="UTF-8"?>' +
'<osm version="0.6">' +
' <bounds minlat="40.655" minlon="-74.542" maxlat="40.656" maxlon="-74.541' +
@@ -595,6 +595,55 @@ describe('iD.serviceOsm', function () {
});
describe('#loadNotes', function() {
beforeEach(function() {
context.projection
.scale(116722210.56960216)
.translate([244505613.61327893, 74865520.92230521])
.clipExtent([[0,0], [609.34375, 826]]);
});
it('fires loadedNotes when notes are loaded', function() {
connection.on('loadedNotes', spy);
connection.loadNotes(context.projection, [64, 64], {});
var url = 'http://www.openstreetmap.org/api/0.6/notes?limit=10000&closed=7&bbox=-120.05859375,34.45221847282654,-119.970703125,34.52466147177173';
var notesXML = ''; // TODO: determine output even though this test note is closed and will be gone soon
server.respondWith('GET', url,
[200, { 'Content-Type': 'text/xml' }, notesXML ]);
server.respond();
expect(spy).to.have.been.calledOnce;
});
});
describe('#notes', function() {
beforeEach(function() {
var dimensions = [64, 64];
context.projection
.scale(667544.214430109) // z14
.translate([-116508, 0]) // 10,0
.clipExtent([[0,0], dimensions]);
});
it('returns notes in the visible map area', function() {
var notes = [
{ minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0] } },
{ minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0] } },
{ minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1] } }
];
connection.caches('get').note.rtree.load(notes);
var res = connection.notes(context.projection);
expect(res).to.deep.eql([
{ key: '0', loc: [10,0] },
{ key: '1', loc: [10,0] }
]);
});
});
describe('#getNote', function() {
it('returns a note', function (done) {