diff --git a/modules/services/vegbilder.js b/modules/services/vegbilder.js index fe6f506e7..5364a997e 100644 --- a/modules/services/vegbilder.js +++ b/modules/services/vegbilder.js @@ -33,13 +33,13 @@ async function fetchAvailableLayers() { }; const urlForRequest = owsEndpoint + utilQsString(params); - const repsonse = await d3_xml(urlForRequest); + const response = await d3_xml(urlForRequest); const xPathSelector = '/wfs:WFS_Capabilities/wfs:FeatureTypeList/wfs:FeatureType/wfs:Name'; const regexMatcher = /^vegbilder_1_0:Vegbilder(?_360)?_(?\d{4})$/; - const NSResolver = repsonse.createNSResolver(repsonse); - const l = repsonse.evaluate( + const NSResolver = response.createNSResolver(response); + const l = response.evaluate( xPathSelector, - repsonse, + response, NSResolver, XPathResult.ANY_TYPE ); @@ -232,17 +232,18 @@ function orderSequences(projection, cache) { }, []); cache.sequences = imageSequences.map(images => { - const seqence = { + const sequence = { images, key: images[0].key, geometry : { type : 'LineString', coordinates : images.map(image => image.loc) - }}; + } + }; for (const image of images) { - _vegbilderCache.image2sequence_map.set(image.key, seqence); + _vegbilderCache.image2sequence_map.set(image.key, sequence); } - return seqence; + return sequence; }); } diff --git a/test/spec/services/vegbilder.js b/test/spec/services/vegbilder.js index d8a2936ec..d340aeb64 100644 --- a/test/spec/services/vegbilder.js +++ b/test/spec/services/vegbilder.js @@ -159,7 +159,7 @@ describe('iD.serviceVegbilder', function() { describe('loadImages', function () { it('fires loadedImages when images are loaded', function() { - const respons = { + const response = { 'type': 'FeatureCollection', 'features': [ { @@ -203,7 +203,7 @@ describe('iD.serviceVegbilder', function() { service: 'WFS', request: 'GetFeature' } - }, respons); + }, response); return new Promise((resolve) => { vegbilder.on('loadedImages', () => { @@ -216,7 +216,7 @@ describe('iD.serviceVegbilder', function() { }); it('does not load images around null island', async function() { - const respons = { + const response = { 'type': 'FeatureCollection', 'features': [ { @@ -240,7 +240,7 @@ describe('iD.serviceVegbilder', function() { service: 'WFS', request: 'GetFeature' } - }, respons); + }, response); context.projection.translate([0, 0]);