From 7ad765d40883384e08ef1b60a9f709fb040c3045 Mon Sep 17 00:00:00 2001
From: Thomas Hervey <thomasahervey@gmail.com>
Date: Mon, 16 Jul 2018 10:54:40 -0400
Subject: [PATCH] added simple tests for loading and retrieving notes

---
 modules/services/osm.js   |  9 +++++++
 test/index.html           |  1 -
 test/spec/services/osm.js | 51 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/modules/services/osm.js b/modules/services/osm.js
index 8ac947f5f..7e9faf49d 100644
--- a/modules/services/osm.js
+++ b/modules/services/osm.js
@@ -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 = {};
diff --git a/test/index.html b/test/index.html
index 2dc8938e4..602943c8d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -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>
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
index 929b14f69..bc1617b4c 100644
--- a/test/spec/services/osm.js
+++ b/test/spec/services/osm.js
@@ -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) {