umap-project 1.14.0a5__py3-none-any.whl → 2.0.0a0__py3-none-any.whl

umap/static/umap/test/Feature.js

@@ -1,21 +1,25 @@
-describe('L.U.FeatureMixin', function () {
-  before(function () {
-    this.server = sinon.fakeServer.create()
-    this.server.respondWith(
+describe('U.FeatureMixin', function () {
+  let map, datalayer
+  before(async () => {
+    await fetchMock.mock(
       /\/datalayer\/62\/\?.*/,
       JSON.stringify(RESPONSES.datalayer62_GET)
     )
-    this.map = initMap({ umap_id: 99 })
-    this.datalayer = this.map.getDataLayerByUmapId(62)
-    this.server.respond()
+    this.options = {
+      umap_id: 99,
+    }
+    MAP = map = initMap({ umap_id: 99 })
+    const datalayer_options = defaultDatalayerData()
+    await map.initDataLayers([datalayer_options])
+    datalayer = map.getDataLayerByUmapId(62)
   })
   after(function () {
-    this.server.restore()
+    fetchMock.restore()
     resetMap()
   })
 
   describe('#edit()', function () {
-    var link
+    let link
 
     it('should have datalayer features created', function () {
       assert.equal(
@@ -45,7 +49,7 @@ describe('L.U.FeatureMixin', function () {
 
     it('should take into account styles changes made in the datalayer', function () {
       happen.click(
-        qs('#browse_data_toggle_' + L.stamp(this.datalayer) + ' .layer-edit')
+        qs('#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-edit')
       )
       var colorInput = qs('form#datalayer-advanced-properties input[name=color]')
       changeInputValue(colorInput, 'DarkRed')
@@ -101,7 +105,7 @@ describe('L.U.FeatureMixin', function () {
 
     it('should not override already set style on features', function () {
       happen.click(
-        qs('#browse_data_toggle_' + L.stamp(this.datalayer) + ' .layer-edit')
+        qs('#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-edit')
       )
       changeInputValue(qs('#umap-ui-container form input[name=color]'), 'Chocolate')
       assert.notOk(qs('path[fill="DarkBlue"]'))
@@ -120,22 +124,22 @@ describe('L.U.FeatureMixin', function () {
 
     it('should set map.editedFeature on edit', function () {
       enableEdit()
-      assert.notOk(this.map.editedFeature)
+      assert.notOk(map.editedFeature)
       happen.click(qs('path[fill="DarkBlue"]'))
       happen.click(qs('ul.leaflet-inplace-toolbar a.umap-toggle-edit'))
-      assert.ok(this.map.editedFeature)
+      assert.ok(map.editedFeature)
       disableEdit()
     })
 
     it('should reset map.editedFeature on panel open', function (done) {
       enableEdit()
-      assert.notOk(this.map.editedFeature)
+      assert.notOk(map.editedFeature)
       happen.click(qs('path[fill="DarkBlue"]'))
       happen.click(qs('ul.leaflet-inplace-toolbar a.umap-toggle-edit'))
-      assert.ok(this.map.editedFeature)
-      this.map.displayCaption()
+      assert.ok(map.editedFeature)
+      map.displayCaption()
       window.setTimeout(function () {
-        assert.notOk(this.map.editedFeature)
+        assert.notOk(map.editedFeature)
         disableEdit()
         done()
       }, 1001) // CSS transition time.
@@ -155,7 +159,7 @@ describe('L.U.FeatureMixin', function () {
       })
     }
     it('should generate a valid geojson', function () {
-      setFeatures(this.datalayer)
+      setFeatures(datalayer)
       assert.ok(poly)
       assert.deepEqual(poly.toGeoJSON().geometry, {
         type: 'Polygon',
@@ -176,7 +180,7 @@ describe('L.U.FeatureMixin', function () {
     })
 
     it('should remove empty _umap_options from exported geojson', function () {
-      setFeatures(this.datalayer)
+      setFeatures(datalayer)
       assert.ok(poly)
       assert.deepEqual(poly.toGeoJSON().properties, { name: 'name poly' })
       assert.ok(marker)
@@ -190,7 +194,7 @@ describe('L.U.FeatureMixin', function () {
   describe('#openPopup()', function () {
     let poly
     before(function () {
-      this.datalayer.eachLayer(function (layer) {
+      datalayer.eachLayer(function (layer) {
         if (!poly && layer instanceof L.Polygon) {
           poly = layer
         }
@@ -233,8 +237,8 @@ describe('L.U.FeatureMixin', function () {
     })
 
     it('should still highlight marker after hide() and show()', function () {
-      this.datalayer.hide()
-      this.datalayer.show()
+      datalayer.hide()
+      datalayer.show()
       happen.click(qs('div.leaflet-marker-icon'))
       assert.ok(qs('.umap-icon-active'))
     })
@@ -254,9 +258,9 @@ describe('L.U.FeatureMixin', function () {
 
   describe('#tooltip', function () {
     it('should have a tooltip when active and allow variables', function () {
-      this.map.options.showLabel = true
-      this.map.options.labelKey = 'Foo {name}'
-      this.datalayer.redraw()
+      map.options.showLabel = true
+      map.options.labelKey = 'Foo {name}'
+      datalayer.redraw()
       assert.equal(
         qs('.leaflet-tooltip-pane .leaflet-tooltip').textContent,
         'Foo name poly'
@@ -266,7 +270,7 @@ describe('L.U.FeatureMixin', function () {
 
   describe('#properties()', function () {
     it('should rename property', function () {
-      var poly = this.datalayer._lineToLayer({}, [
+      var poly = datalayer._lineToLayer({}, [
         [0, 0],
         [0, 1],
         [0, 2],
@@ -278,7 +282,7 @@ describe('L.U.FeatureMixin', function () {
     })
 
     it('should not create property when renaming', function () {
-      var poly = this.datalayer._lineToLayer({}, [
+      var poly = datalayer._lineToLayer({}, [
         [0, 0],
         [0, 1],
         [0, 2],
@@ -289,7 +293,7 @@ describe('L.U.FeatureMixin', function () {
     })
 
     it('should delete property', function () {
-      var poly = this.datalayer._lineToLayer({}, [
+      var poly = datalayer._lineToLayer({}, [
         [0, 0],
         [0, 1],
         [0, 2],
@@ -305,7 +309,7 @@ describe('L.U.FeatureMixin', function () {
     var poly
 
     it('should filter on properties', function () {
-      poly = this.datalayer._lineToLayer({}, [
+      poly = datalayer._lineToLayer({}, [
         [0, 0],
         [0, 1],
         [0, 2],
@@ -329,35 +333,6 @@ describe('L.U.FeatureMixin', function () {
     })
   })
 
-  describe('#quick-delete()', function () {
-    let poly, _confirm
-    before(function () {
-      _confirm = window.confirm
-      window.confirm = function (text) {
-        return true
-      }
-
-      this.datalayer.eachLayer(function (layer) {
-        if (!poly && layer instanceof L.Polygon) {
-          poly = layer
-        }
-      })
-    })
-
-    after(function () {
-      window.confirm = _confirm
-    })
-
-    it('should allow to delete from data browser', function () {
-      enableEdit()
-      assert.ok(qs('path[fill="DarkBlue"]'))
-      this.map.openBrowser()
-      happen.click(qs('.feature-delete'))
-      assert.notOk(qs('path[fill="DarkBlue"]'))
-      clickCancel()
-    })
-  })
-
   describe('#changeDataLayer()', function () {
     it('should change style on datalayer select change', function () {
       enableEdit()

umap/static/umap/test/Map.Export.js

@@ -1,26 +1,26 @@
-describe('L.U.Map.Export', function () {
-  before(function () {
-    this.server = sinon.fakeServer.create()
-    this.server.respondWith(
+describe('U.Map.Export', function () {
+  let map
+  before(async () => {
+    await fetchMock.mock(
       /\/datalayer\/62\/\?.*/,
       JSON.stringify(RESPONSES.datalayer62_GET)
     )
     this.options = {
       umap_id: 99,
     }
-    this.map = initMap({ umap_id: 99 })
-    this.server.respond()
-    this.datalayer = this.map.getDataLayerByUmapId(62)
+    map = initMap({ umap_id: 99 })
+    const datalayer_options = defaultDatalayerData()
+    await map.initDataLayers([datalayer_options])
   })
   after(function () {
-    this.server.restore()
+    fetchMock.restore()
     clickCancel()
     resetMap()
   })
 
   describe('#formatters()', function () {
     it('should export to geojson', function () {
-      const { content, filetype, filename } = this.map.share.format('geojson')
+      const { content, filetype, filename } = map.share.format('geojson')
       assert.equal(filetype, 'application/json')
       assert.equal(filename, 'name_of_the_map.geojson')
       assert.deepEqual(JSON.parse(content), {
@@ -86,7 +86,7 @@ describe('L.U.Map.Export', function () {
     })
 
     it('should export to gpx', function () {
-      const { content, filetype, filename } = this.map.share.format('gpx')
+      const { content, filetype, filename } = map.share.format('gpx')
       assert.equal(filetype, 'application/gpx+xml')
       assert.equal(filename, 'name_of_the_map.gpx')
       const expected =
@@ -95,7 +95,7 @@ describe('L.U.Map.Export', function () {
     })
 
     it('should export to kml', function () {
-      const { content, filetype, filename } = this.map.share.format('kml')
+      const { content, filetype, filename } = map.share.format('kml')
       assert.equal(filetype, 'application/vnd.google-earth.kml+xml')
       assert.equal(filename, 'name_of_the_map.kml')
       const expected =

umap/static/umap/test/Map.js

@@ -1,26 +1,27 @@
-describe('L.U.Map', function () {
-  before(function () {
-    this.server = sinon.fakeServer.create()
-    this.server.respondWith(
+describe('U.Map', () => {
+  let map, datalayer
+  before(async () => {
+    await fetchMock.mock(
       /\/datalayer\/62\/\?.*/,
       JSON.stringify(RESPONSES.datalayer62_GET)
     )
     this.options = {
       umap_id: 99,
     }
-    this.map = initMap({ umap_id: 99 })
-    this.server.respond()
-    this.datalayer = this.map.getDataLayerByUmapId(62)
+    map = initMap({ umap_id: 99 })
+    const datalayer_options = defaultDatalayerData()
+    await map.initDataLayers([datalayer_options])
+    datalayer = map.getDataLayerByUmapId(62)
   })
-  after(function () {
-    this.server.restore()
+  after(() => {
+    fetchMock.restore()
     clickCancel()
     resetMap()
   })
 
-  describe('#init()', function () {
+  describe('#init()', () => {
     it('should be initialized', function () {
-      assert.equal(this.map.options.umap_id, 99)
+      assert.equal(map.options.umap_id, 99)
     })
 
     it('should have created the edit button', function () {
@@ -42,7 +43,7 @@ describe('L.U.Map', function () {
     it('should hide icon container div when hiding datalayer', function () {
       var el = qs(
         '.leaflet-control-browse #browse_data_toggle_' +
-          L.stamp(this.datalayer) +
+          L.stamp(datalayer) +
           ' .layer-toggle'
       )
       happen.click(el)
@@ -56,7 +57,7 @@ describe('L.U.Map', function () {
     })
 
     it('should have only one datalayer in its index', function () {
-      assert.equal(this.map.datalayers_index.length, 1)
+      assert.equal(map.datalayers_index.length, 1)
     })
   })
 
@@ -78,20 +79,20 @@ describe('L.U.Map', function () {
       var new_name = 'This is a new name'
       input.value = new_name
       happen.once(input, { type: 'input' })
-      assert.equal(this.map.options.name, new_name)
+      assert.equal(map.options.name, new_name)
     })
 
     it('should have made Map dirty', function () {
-      assert.ok(this.map.isDirty)
+      assert.ok(map.isDirty)
     })
 
     it('should have added dirty class on map container', function () {
-      assert.ok(L.DomUtil.hasClass(this.map._container, 'umap-is-dirty'))
+      assert.ok(L.DomUtil.hasClass(map._container, 'umap-is-dirty'))
     })
   })
 
   describe('#delete()', function () {
-    var path = '/map/99/delete/',
+    let path = '/map/99/update/delete/',
       oldConfirm,
       newConfirm = function () {
         return true
@@ -105,24 +106,22 @@ describe('L.U.Map', function () {
       window.confirm = oldConfirm
     })
 
-    it('should ask for confirmation on delete link click', function () {
-      var button = qs('a.update-map-settings')
+    it('should ask for confirmation on delete link click', async function () {
+      let button = qs('a.update-map-settings')
       assert.ok(button, 'update map info button exists')
       happen.click(button)
-      var deleteLink = qs('button.umap-delete')
+      let deleteLink = qs('button.umap-delete')
       assert.ok(deleteLink, 'delete map button exists')
       sinon.spy(window, 'confirm')
-      this.server.respondWith('POST', path, JSON.stringify({ redirect: '#' }))
+      await fetchMock.post(path, { redirect: '#' })
       happen.click(deleteLink)
-      this.server.respond()
       assert(window.confirm.calledOnce)
       window.confirm.restore()
-
     })
   })
 
   describe('#importData()', function () {
-    var fileInput, textarea, submit, formatSelect, layerSelect, clearFlag
+    let fileInput, textarea, submit, formatSelect, layerSelect, clearFlag
 
     it('should build a form on click', function () {
       happen.click(qs('a.upload-data'))
@@ -139,82 +138,82 @@ describe('L.U.Map', function () {
     })
 
     it('should import geojson from textarea', function () {
-      this.datalayer.empty()
-      assert.equal(this.datalayer._index.length, 0)
+      datalayer.empty()
+      assert.equal(datalayer._index.length, 0)
       textarea.value =
         '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [6.922931671142578, 47.481161607175736]}, "type": "Feature", "properties": {"color": "", "name": "Chez R\u00e9my", "description": ""}}, {"geometry": {"type": "LineString", "coordinates": [[2.4609375, 48.88639177703194], [2.48291015625, 48.76343113791796], [2.164306640625, 48.719961222646276]]}, "type": "Feature", "properties": {"color": "", "name": "P\u00e9rif", "description": ""}}]}'
       changeSelectValue(formatSelect, 'geojson')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 2)
+      assert.equal(datalayer._index.length, 2)
     })
 
     it('should remove dot in property name', function () {
-      this.datalayer.empty()
-      assert.equal(this.datalayer._index.length, 0)
+      datalayer.empty()
+      assert.equal(datalayer._index.length, 0)
       textarea.value =
         '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [6.922931671142578, 47.481161607175736]}, "type": "Feature", "properties": {"color": "", "name": "Chez R\u00e9my", "A . in the name": ""}}, {"geometry": {"type": "LineString", "coordinates": [[2.4609375, 48.88639177703194], [2.48291015625, 48.76343113791796], [2.164306640625, 48.719961222646276]]}, "type": "Feature", "properties": {"color": "", "name": "P\u00e9rif", "with a dot.": ""}}]}'
       changeSelectValue(formatSelect, 'geojson')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 2)
-      assert.ok(this.datalayer._propertiesIndex.includes('A _ in the name'))
-      assert.ok(this.datalayer._propertiesIndex.includes('with a dot_'))
+      assert.equal(datalayer._index.length, 2)
+      assert.ok(datalayer._propertiesIndex.includes('A _ in the name'))
+      assert.ok(datalayer._propertiesIndex.includes('with a dot_'))
     })
 
     it('should import osm from textarea', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       happen.click(qs('a.upload-data'))
       textarea = qs('.umap-upload textarea')
       submit = qs('.umap-upload input[type="button"]')
       formatSelect = qs('.umap-upload select[name="format"]')
-      assert.equal(this.datalayer._index.length, 0)
+      assert.equal(datalayer._index.length, 0)
       textarea.value =
         '{"version": 0.6,"generator": "Overpass API 0.7.55.4 3079d8ea","osm3s": {"timestamp_osm_base": "2018-09-22T05:26:02Z","copyright": "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL."},"elements": [{"type": "node","id": 3619112991,"lat": 48.9352995,"lon": 2.3570684,"tags": {"information": "map","map_size": "city","map_type": "scheme","tourism": "information"}},{"type": "node","id": 3682500756,"lat": 48.9804426,"lon": 2.2719725,"tags": {"information": "map","level": "0","tourism": "information"}}]}'
       changeSelectValue(formatSelect, 'osm')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 2)
+      assert.equal(datalayer._index.length, 2)
       assert.equal(
-        this.datalayer._layers[this.datalayer._index[0]].properties.tourism,
+        datalayer._layers[datalayer._index[0]].properties.tourism,
         'information'
       )
     })
 
     it('should import kml from textarea', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       happen.click(qs('a.upload-data'))
       textarea = qs('.umap-upload textarea')
       submit = qs('.umap-upload input[type="button"]')
       formatSelect = qs('.umap-upload select[name="format"]')
-      assert.equal(this.datalayer._index.length, 0)
+      assert.equal(datalayer._index.length, 0)
       textarea.value = kml_example
       changeSelectValue(formatSelect, 'kml')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 3)
+      assert.equal(datalayer._index.length, 3)
     })
 
     it('should import gpx from textarea', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       happen.click(qs('a.upload-data'))
       textarea = qs('.umap-upload textarea')
       submit = qs('.umap-upload input[type="button"]')
       formatSelect = qs('.umap-upload select[name="format"]')
-      assert.equal(this.datalayer._index.length, 0)
+      assert.equal(datalayer._index.length, 0)
       textarea.value = gpx_example
       changeSelectValue(formatSelect, 'gpx')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 2)
+      assert.equal(datalayer._index.length, 2)
     })
 
     it('should import csv from textarea', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       happen.click(qs('a.upload-data'))
       textarea = qs('.umap-upload textarea')
       submit = qs('.umap-upload input[type="button"]')
       formatSelect = qs('.umap-upload select[name="format"]')
-      assert.equal(this.datalayer._index.length, 0)
+      assert.equal(datalayer._index.length, 0)
       textarea.value = csv_example
       changeSelectValue(formatSelect, 'csv')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 1)
+      assert.equal(datalayer._index.length, 1)
     })
 
     it('should replace content if asked so', function () {
@@ -224,52 +223,52 @@ describe('L.U.Map', function () {
       formatSelect = qs('.umap-upload select[name="format"]')
       clearFlag = qs('.umap-upload input[name="clear"]')
       clearFlag.checked = true
-      assert.equal(this.datalayer._index.length, 1)
+      assert.equal(datalayer._index.length, 1)
       textarea.value = csv_example
       changeSelectValue(formatSelect, 'csv')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 1)
+      assert.equal(datalayer._index.length, 1)
     })
 
     it('should import GeometryCollection from textarea', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       textarea.value =
         '{"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-80.66080570220947,35.04939206472683]},{"type": "Polygon","coordinates": [[[-80.66458225250244,35.04496519190309],[-80.66344499588013,35.04603679820616],[-80.66258668899536,35.045580049697556],[-80.66387414932251,35.044280059194946],[-80.66458225250244,35.04496519190309]]]},{"type": "LineString","coordinates": [[-80.66237211227417,35.05950973022538],[-80.66269397735596,35.0592638296087],[-80.66284418106079,35.05893010615862],[-80.66308021545409,35.05833291342246],[-80.66359519958496,35.057753281001425],[-80.66387414932251,35.05740198662245],[-80.66441059112549,35.05703312589789],[-80.66486120223999,35.056787217822475],[-80.66541910171509,35.05650617911516],[-80.66563367843628,35.05631296444281],[-80.66601991653441,35.055891403570705],[-80.66619157791138,35.05545227534804],[-80.66619157791138,35.05517123204622],[-80.66625595092773,35.05489018777713],[-80.6662130355835,35.054222703761525],[-80.6662130355835,35.05392409072499],[-80.66595554351807,35.05290528508858],[-80.66569805145262,35.052044560077285],[-80.66550493240356,35.0514824490509],[-80.665762424469,35.05048117920187],[-80.66617012023926,35.04972582715769],[-80.66651344299316,35.049286665781096],[-80.66692113876343,35.0485313026898],[-80.66700696945189,35.048215102112344],[-80.66707134246826,35.04777593261294],[-80.66704988479614,35.04738946150025],[-80.66696405410767,35.04698542156371],[-80.66681385040283,35.046353007216055],[-80.66659927368164,35.04596652937105],[-80.66640615463257,35.04561518428889],[-80.6659984588623,35.045193568195565],[-80.66552639007568,35.044877354697526],[-80.6649899482727,35.04454357245502],[-80.66449642181396,35.04417465365292],[-80.66385269165039,35.04387600387859],[-80.66303730010986,35.043717894732545]]}]}'
       formatSelect = qs('.umap-upload select[name="format"]')
       changeSelectValue(formatSelect, 'geojson')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 3)
+      assert.equal(datalayer._index.length, 3)
     })
 
     it('should import multipolygon', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       textarea.value =
         '{"type": "Feature", "properties": { "name": "Some states" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-109, 36], [-109, 40], [-102, 37], [-109, 36]], [[-108, 39], [-107, 37], [-104, 37], [-108, 39]]], [[[-119, 42], [-120, 39], [-114, 41], [-119, 42]]]] }}'
       changeSelectValue(formatSelect, 'geojson')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 1)
-      var layer = this.datalayer.getFeatureByIndex(0)
+      assert.equal(datalayer._index.length, 1)
+      var layer = datalayer.getFeatureByIndex(0)
       assert.equal(layer._latlngs.length, 2) // Two shapes.
       assert.equal(layer._latlngs[0].length, 2) // Hole.
     })
 
     it('should import multipolyline', function () {
-      this.datalayer.empty()
+      datalayer.empty()
       textarea.value =
         '{"type": "FeatureCollection", "features": [{ "type": "Feature", "properties": {}, "geometry": { "type": "MultiLineString", "coordinates": [[[-108, 46], [-113, 43]], [[-112, 45], [-115, 44]]] } }]}'
       changeSelectValue(formatSelect, 'geojson')
       happen.click(submit)
-      assert.equal(this.datalayer._index.length, 1)
-      var layer = this.datalayer.getFeatureByIndex(0)
+      assert.equal(datalayer._index.length, 1)
+      var layer = datalayer.getFeatureByIndex(0)
       assert.equal(layer._latlngs.length, 2) // Two shapes.
     })
 
     it('should import raw umap data from textarea', function () {
       //Right now, the import function will try to save and reload. Stop this from happening.
-      var disabledSaveFunction = this.map.save
-      this.map.save = function () {}
+      var disabledSaveFunction = map.save
+      map.save = function () {}
       happen.click(qs('a.upload-data'))
-      var initialLayerCount = Object.keys(this.map.datalayers).length
+      var initialLayerCount = Object.keys(map.datalayers).length
       formatSelect = qs('.umap-upload select[name="format"]')
       textarea = qs('.umap-upload textarea')
       textarea.value =
@@ -277,12 +276,12 @@ describe('L.U.Map', function () {
       formatSelect.value = 'umap'
       submit = qs('.umap-upload input[type="button"]')
       happen.click(submit)
-      assert.equal(Object.keys(this.map.datalayers).length, initialLayerCount + 2)
-      assert.equal(this.map.options.name, 'Imported map')
+      assert.equal(Object.keys(map.datalayers).length, initialLayerCount + 2)
+      assert.equal(map.options.name, 'Imported map')
       var foundFirstLayer = false
       var foundSecondLayer = false
-      for (var idx in this.map.datalayers) {
-        var datalayer = this.map.datalayers[idx]
+      for (var idx in map.datalayers) {
+        var datalayer = map.datalayers[idx]
         if (datalayer.options.name === 'Cities') {
           foundFirstLayer = true
           assert.equal(datalayer._index.length, 2)
@@ -297,7 +296,7 @@ describe('L.U.Map', function () {
     })
 
     it('should only import options on the whitelist (umap format import)', function () {
-      assert.equal(this.map.options.umap_id, 99)
+      assert.equal(map.options.umap_id, 99)
     })
 
     it('should update title bar (umap format import)', function () {
@@ -318,7 +317,7 @@ describe('L.U.Map', function () {
 
     it('should set the tilelayer (umap format import)', function () {
       assert.equal(
-        this.map.selected_tilelayer._url,
+        map.selected_tilelayer._url,
         'http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg'
       )
     })
@@ -327,14 +326,14 @@ describe('L.U.Map', function () {
   describe('#localizeUrl()', function () {
     it('should replace known variables', function () {
       assert.equal(
-        this.map.localizeUrl('http://example.org/{zoom}'),
-        'http://example.org/' + this.map.getZoom()
+        map.localizeUrl('http://example.org/{zoom}'),
+        'http://example.org/' + map.getZoom()
       )
     })
 
     it('should keep unknown variables', function () {
       assert.equal(
-        this.map.localizeUrl('http://example.org/{unkown}'),
+        map.localizeUrl('http://example.org/{unkown}'),
         'http://example.org/{unkown}'
       )
     })