umap-project 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.1.1"
+VERSION = "2.1.3"

umap/models.py

@@ -1,4 +1,5 @@
 import json
+import operator
 import os
 import time
 import uuid
@@ -442,6 +443,8 @@ class DataLayer(NamedModel):
             "name": self.name,
             "displayOnLoad": self.display_on_load,
         }
+        if self.old_id:
+            obj["old_id"] = self.old_id
         obj["id"] = self.pk
         obj["permissions"] = {"edit_status": self.edit_status}
         obj["editMode"] = "advanced" if self.can_edit(user, request) else "disabled"
@@ -471,17 +474,14 @@ class DataLayer(NamedModel):
             "size": self.geojson.storage.size(self.get_version_path(name)),
         }
 
-    def get_versions(self):
+    @property
+    def versions(self):
         root = self.storage_root()
         names = self.geojson.storage.listdir(root)[1]
         names = [name for name in names if self.is_valid_version(name)]
-        names.sort(reverse=True)  # Recent first.
-        return names
-
-    @property
-    def versions(self):
-        names = self.get_versions()
-        return [self.version_metadata(name) for name in names]
+        versions = [self.version_metadata(name) for name in names]
+        versions.sort(reverse=True, key=operator.itemgetter("at"))
+        return versions
 
     def get_version(self, name):
         path = self.get_version_path(name)
@@ -493,8 +493,13 @@ class DataLayer(NamedModel):
 
     def purge_old_versions(self):
         root = self.storage_root()
-        names = self.get_versions()[settings.UMAP_KEEP_VERSIONS :]
-        for name in names:
+        versions = self.versions[settings.UMAP_KEEP_VERSIONS :]
+        for version in versions:
+            name = version["name"]
+            # Should not be in the list, but ensure to not delete the file
+            # currently used in database
+            if self.geojson.name.endswith(name):
+                continue
             try:
                 self.geojson.storage.delete(os.path.join(root, name))
             except FileNotFoundError:
@@ -503,8 +508,12 @@ class DataLayer(NamedModel):
     def purge_gzip(self):
         root = self.storage_root()
         names = self.geojson.storage.listdir(root)[1]
+        prefixes = [f"{self.pk}_"]
+        if self.old_id:
+            prefixes.append(f"{self.old_id}_")
+        prefixes = tuple(prefixes)
         for name in names:
-            if name.startswith(f"{self.pk}_") and name.endswith(".gz"):
+            if name.startswith(prefixes) and name.endswith(".gz"):
                 self.geojson.storage.delete(os.path.join(root, name))
 
     def can_edit(self, user=None, request=None):

umap/static/umap/js/modules/request.js

@@ -146,7 +146,7 @@ export class ServerRequest extends Request {
   _onNOK(error) {
     if (error.status === 403) {
       this.ui.alert({
-        content: message || L._('Action not allowed :('),
+        content: error.message || L._('Action not allowed :('),
         level: 'error',
       })
     }

umap/static/umap/js/umap.controls.js

@@ -1234,6 +1234,35 @@ U.StarControl = L.Control.extend({
   },
 })
 
+/*
+ * Take control over L.Control.Locate to be able to
+ * call start() before adding the control (and thus the button) to the map.
+ */
+U.Locate = L.Control.Locate.extend({
+  initialize: function (map, options) {
+    // When calling start(), it will try to add a location marker
+    // on the layer, which is normally added in the addTo/onAdd method
+    this._layer = this.options.layer = new L.LayerGroup()
+    // When calling start(), it will call _activate(), which then adds
+    // location related event listeners on the map
+    this.map = map
+    L.Control.Locate.prototype.initialize.call(this, options)
+  },
+
+  onAdd: function (map) {
+    const active = this._active
+    const container = L.Control.Locate.prototype.onAdd.call(this, map)
+    this._active = active
+    return container
+  },
+
+  _activate: function () {
+    this._map = this.map
+    L.Control.Locate.prototype._activate.call(this)
+    this._map = null
+  }
+})
+
 U.Search = L.PhotonSearch.extend({
   initialize: function (map, input, options) {
     this.options.placeholder = L._('Type a place name or coordinates')

umap/static/umap/js/umap.features.js

@@ -888,7 +888,9 @@ U.PathMixin = {
     const other = new (this instanceof U.Polyline ? U.Polyline : U.Polygon)(
       this.map,
       shape,
-      { geojson: { properties: properties } }
+      {
+        geojson: { properties },
+      }
     )
     this.datalayer.addLayer(other)
     other.edit()

umap/static/umap/js/umap.importer.js

@@ -39,11 +39,10 @@ U.Importer = L.Class.extend({
       this.container,
       L._('Choose the layer to import in')
     )
-    this.clearLabel = L.DomUtil.add(
+    this.clearLabel = L.DomUtil.element(
       'label',
-      '',
-      this.container,
-      L._('Replace layer content')
+      { textContent: L._('Replace layer content'), for: 'datalayer-clear-check' },
+      this.container
     )
     this.submitInput = L.DomUtil.element(
       'input',
@@ -59,7 +58,7 @@ U.Importer = L.Class.extend({
     )
     this.clearFlag = L.DomUtil.element(
       'input',
-      { type: 'checkbox', name: 'clear' },
+      { type: 'checkbox', name: 'clear', id: 'datalayer-clear-check' },
       this.clearLabel
     )
     let option

umap/static/umap/js/umap.js

@@ -67,14 +67,15 @@ U.Map = L.Map.extend({
     this.description = this.options.description
     this.demoTileInfos = this.options.demoTileInfos
     this.options.zoomControl = zoomControl !== undefined ? zoomControl : true
-    this.options.fullscreenControl = fullscreenControl !== undefined ? fullscreenControl : true
-    this.datalayersOnLoad = L.Util.queryString('datalayers')
-    if (this.datalayersOnLoad) {
-      this.datalayersOnLoad = this.datalayersOnLoad.toString().split(',')
+    this.options.fullscreenControl =
+      fullscreenControl !== undefined ? fullscreenControl : true
+    this.datalayersFromQueryString = L.Util.queryString('datalayers')
+    if (this.datalayersFromQueryString) {
+      this.datalayersFromQueryString = this.datalayersFromQueryString
+        .toString()
+        .split(',')
     }
 
-    if (L.Browser.ielt9) this.options.editMode = 'disabled' // TODO include ie9
-
     let editedFeature = null
     const self = this
     try {
@@ -114,12 +115,12 @@ U.Map = L.Map.extend({
     // Needed for actions labels
     this.help = new U.Help(this)
 
-    if (this.options.hash) this.addHash()
-    this.initTileLayers()
-    // Needs tilelayer to exist for minimap
     this.initControls()
     // Needs locate control and hash to exist
     this.initCenter()
+    this.initTileLayers()
+    // Needs tilelayer to exist for minimap
+    this.renderControls()
     this.handleLimitBounds()
     this.initDataLayers()
 
@@ -268,9 +269,9 @@ U.Map = L.Map.extend({
   },
 
   overrideSchema: function (schema) {
-   for (const [key, extra] of Object.entries(schema)) {
-     U.SCHEMA[key] = L.extend({}, U.SCHEMA[key], extra)
-   }
+    for (const [key, extra] of Object.entries(schema)) {
+      U.SCHEMA[key] = L.extend({}, U.SCHEMA[key], extra)
+    }
   },
 
   initControls: function () {
@@ -297,7 +298,7 @@ U.Map = L.Map.extend({
       zoomOutTitle: L._('Zoom out'),
     })
     this._controls.datalayers = new U.DataLayersControl(this)
-    this._controls.locate = L.control.locate({
+    this._controls.locate = new U.Locate(this, {
       strings: {
         title: L._('Center map on your location'),
       },
@@ -336,9 +337,6 @@ U.Map = L.Map.extend({
     this.drop = new U.DropControl(this)
     this.share = new U.Share(this)
     this._controls.tilelayers = new U.TileLayerControl(this)
-    this._controls.tilelayers.setLayers()
-
-    this.renderControls()
   },
 
   renderControls: function () {
@@ -353,13 +351,13 @@ U.Map = L.Map.extend({
       'umap-slideshow-enabled',
       this.options.slideshow && this.options.slideshow.active
     )
-    for (const i in this._controls) {
-      this.removeControl(this._controls[i])
+    for (const control of Object.values(this._controls)) {
+      this.removeControl(control)
     }
     if (this.options.noControl) return
 
     this._controls.attribution = new U.AttributionControl().addTo(this)
-    if (this.options.miniMap && !this.options.noControl) {
+    if (this.options.miniMap) {
       this.whenReady(function () {
         if (this.selected_tilelayer) {
           this._controls.miniMap = new L.Control.MiniMap(this.selected_tilelayer, {
@@ -392,6 +390,7 @@ U.Map = L.Map.extend({
     if (this.getOption('permanentCredit')) this._controls.permanentCredit.addTo(this)
     if (this.getOption('moreControl')) this._controls.more.addTo(this)
     if (this.getOption('scaleControl')) this._controls.scale.addTo(this)
+    this._controls.tilelayers.setLayers()
   },
 
   initDataLayers: async function (datalayers) {
@@ -652,26 +651,18 @@ U.Map = L.Map.extend({
   },
 
   initCenter: function () {
+    this._setDefaultCenter()
+    if (this.options.hash) this.addHash()
     if (this.options.hash && this._hash.parseHash(location.hash)) {
       // FIXME An invalid hash will cause the load to fail
       this._hash.update()
     } else if (this.options.defaultView === 'locate' && !this.options.noControl) {
-      // When using locate as default map view AND activating easing
-      // Leaflet.locate will ask the map view to compute transition to user
-      // position, so in this case we do need a default center, so let's
-      // set it anyway
-      this._setDefaultCenter()
       this._controls.locate.start()
     } else if (this.options.defaultView === 'data') {
-      this.onceDataLoaded(() => {
-        if (!this.fitDataBounds()) return this._setDefaultCenter()
-      })
+      this.onceDataLoaded(this.fitDataBounds)
     } else if (this.options.defaultView === 'latest') {
       this.onceDataLoaded(() => {
-        if (!this.hasData()) {
-          this._setDefaultCenter()
-          return
-        }
+        if (!this.hasData()) return
         const datalayer = this.firstVisibleDatalayer()
         let feature
         if (datalayer) {
@@ -681,11 +672,7 @@ U.Map = L.Map.extend({
             return
           }
         }
-        // Fallback, no datalayer or no feature found
-        this._setDefaultCenter()
       })
-    } else {
-      this._setDefaultCenter()
     }
   },
 
@@ -974,6 +961,8 @@ U.Map = L.Map.extend({
     formData.append('settings', JSON.stringify(geojson))
     const uri = this.urls.get('map_save', { map_id: this.options.umap_id })
     const [data, response, error] = await this.server.post(uri, {}, formData)
+    // FIXME: login_required response will not be an error, so it will not
+    // stop code while it should
     if (!error) {
       let duration = 3000,
         alert = { content: L._('Map has been saved!'), level: 'info' }
@@ -1538,7 +1527,9 @@ U.Map = L.Map.extend({
       metadataFields = ['options.name', 'options.description'],
       title = L.DomUtil.create('h3', '', container)
     title.textContent = L._('Edit map properties')
-    const builder = new U.FormBuilder(this, metadataFields)
+    const builder = new U.FormBuilder(this, metadataFields, {
+      className: 'map-metadata',
+    })
     const form = builder.build()
     container.appendChild(form)
     this._editControls(container)

umap/static/umap/js/umap.layer.js

@@ -609,12 +609,13 @@ U.DataLayer = L.Evented.extend({
   },
 
   autoLoaded: function () {
-    return (
-      (this.map.datalayersOnLoad &&
-        this.umap_id &&
-        this.map.datalayersOnLoad.indexOf(this.umap_id.toString()) !== -1) ||
-      (!this.map.datalayersOnLoad && this.options.displayOnLoad)
-    )
+    if (!this.map.datalayersFromQueryString) return this.options.displayOnLoad
+    const datalayerIds = this.map.datalayersFromQueryString
+    let loadMe = datalayerIds.includes(this.umap_id.toString())
+    if (this.options.old_id) {
+      loadMe = loadMe || datalayerIds.includes(this.options.old_id.toString())
+    }
+    return loadMe
   },
 
   insertBefore: function (other) {

umap/static/umap/test/Map.js

@@ -19,310 +19,6 @@ describe('U.Map', () => {
     resetMap()
   })
 
-  describe('#init()', () => {
-    it('should be initialized', function () {
-      assert.equal(map.options.umap_id, 99)
-    })
-
-    it('should have created the edit button', function () {
-      assert.ok(qs('div.leaflet-control-edit-enable'))
-    })
-
-    it('should have datalayer control div', function () {
-      assert.ok(qs('div.leaflet-control-browse'))
-    })
-
-    it('should have datalayer actions div', function () {
-      assert.ok(qs('div.umap-browse-actions'))
-    })
-
-    it('should have icon container div', function () {
-      assert.ok(qs('div.icon_container'))
-    })
-
-    it('should hide icon container div when hiding datalayer', function () {
-      var el = qs(
-        '.leaflet-control-browse #browse_data_toggle_' +
-          L.stamp(datalayer) +
-          ' .layer-toggle'
-      )
-      happen.click(el)
-      assert.notOk(qs('div.icon_container'))
-    })
-
-    it('enable edit on click on toggle button', function () {
-      var el = qs('div.leaflet-control-edit-enable button')
-      happen.click(el)
-      assert.isTrue(L.DomUtil.hasClass(document.body, 'umap-edit-enabled'))
-    })
-
-    it('should have only one datalayer in its index', function () {
-      assert.equal(map.datalayers_index.length, 1)
-    })
-  })
-
-  describe('#editMetadata()', function () {
-    var form, input
-
-    it('should build a form on editMetadata control click', function (done) {
-      var button = qs('a.update-map-settings')
-      assert.ok(button)
-      happen.click(button)
-      form = qs('form.umap-form')
-      input = qs('form[class="umap-form"] input[name="name"]')
-      assert.ok(form)
-      assert.ok(input)
-      done()
-    })
-
-    it('should update map name on input change', function () {
-      var new_name = 'This is a new name'
-      input.value = new_name
-      happen.once(input, { type: 'input' })
-      assert.equal(map.options.name, new_name)
-    })
-
-    it('should have made Map dirty', function () {
-      assert.ok(map.isDirty)
-    })
-
-    it('should have added dirty class on map container', function () {
-      assert.ok(L.DomUtil.hasClass(map._container, 'umap-is-dirty'))
-    })
-  })
-
-  describe('#delete()', function () {
-    let path = '/map/99/update/delete/',
-      oldConfirm,
-      newConfirm = function () {
-        return true
-      }
-
-    before(function () {
-      oldConfirm = window.confirm
-      window.confirm = newConfirm
-    })
-    after(function () {
-      window.confirm = oldConfirm
-    })
-
-    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)
-      let deleteLink = qs('button.umap-delete')
-      assert.ok(deleteLink, 'delete map button exists')
-      sinon.spy(window, 'confirm')
-      await fetchMock.post(path, { redirect: '#' })
-      happen.click(deleteLink)
-      assert(window.confirm.calledOnce)
-      window.confirm.restore()
-    })
-  })
-
-  describe('#importData()', function () {
-    let fileInput, textarea, submit, formatSelect, layerSelect, clearFlag
-
-    it('should build a form on click', function () {
-      happen.click(qs('a.upload-data'))
-      fileInput = qs('.umap-upload input[type="file"]')
-      textarea = qs('.umap-upload textarea')
-      submit = qs('.umap-upload input[type="button"]')
-      formatSelect = qs('.umap-upload select[name="format"]')
-      layerSelect = qs('.umap-upload select[name="datalayer"]')
-      assert.ok(fileInput)
-      assert.ok(submit)
-      assert.ok(textarea)
-      assert.ok(formatSelect)
-      assert.ok(layerSelect)
-    })
-
-    it('should import geojson from textarea', function () {
-      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(datalayer._index.length, 2)
-    })
-
-    it('should remove dot in property name', function () {
-      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(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 () {
-      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(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(datalayer._index.length, 2)
-      assert.equal(
-        datalayer._layers[datalayer._index[0]].properties.tourism,
-        'information'
-      )
-    })
-
-    it('should import kml from textarea', function () {
-      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(datalayer._index.length, 0)
-      textarea.value = kml_example
-      changeSelectValue(formatSelect, 'kml')
-      happen.click(submit)
-      assert.equal(datalayer._index.length, 3)
-    })
-
-    it('should import gpx from textarea', function () {
-      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(datalayer._index.length, 0)
-      textarea.value = gpx_example
-      changeSelectValue(formatSelect, 'gpx')
-      happen.click(submit)
-      assert.equal(datalayer._index.length, 2)
-    })
-
-    it('should import csv from textarea', function () {
-      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(datalayer._index.length, 0)
-      textarea.value = csv_example
-      changeSelectValue(formatSelect, 'csv')
-      happen.click(submit)
-      assert.equal(datalayer._index.length, 1)
-    })
-
-    it('should replace content if asked so', function () {
-      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"]')
-      clearFlag = qs('.umap-upload input[name="clear"]')
-      clearFlag.checked = true
-      assert.equal(datalayer._index.length, 1)
-      textarea.value = csv_example
-      changeSelectValue(formatSelect, 'csv')
-      happen.click(submit)
-      assert.equal(datalayer._index.length, 1)
-    })
-
-    it('should import GeometryCollection from textarea', function () {
-      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(datalayer._index.length, 3)
-    })
-
-    it('should import multipolygon', function () {
-      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(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 () {
-      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(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 = map.save
-      map.save = function () {}
-      happen.click(qs('a.upload-data'))
-      var initialLayerCount = Object.keys(map.datalayers).length
-      formatSelect = qs('.umap-upload select[name="format"]')
-      textarea = qs('.umap-upload textarea')
-      textarea.value =
-        '{ "type": "umap", "geometry": { "type": "Point", "coordinates": [3.0528, 50.6269] }, "properties": { "umap_id": 666, "longCredit": "the illustrious mapmaker", "shortCredit": "the mapmaker", "slideshow": {}, "captionBar": true, "dashArray": "5,5", "fillOpacity": "0.5", "fillColor": "Crimson", "fill": true, "weight": "2", "opacity": "0.9", "smoothFactor": "1", "iconClass": "Drop", "color": "Red", "limitBounds": {}, "tilelayer": { "maxZoom": 18, "url_template": "http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg", "minZoom": 0, "attribution": "Map tiles by [[http://stamen.com|Stamen Design]], under [[http://creativecommons.org/licenses/by/3.0|CC BY 3.0]]. Data by [[http://openstreetmap.org|OpenStreetMap]], under [[http://creativecommons.org/licenses/by-sa/3.0|CC BY SA]].", "name": "Watercolor" }, "licence": { "url": "", "name": "No licence set" }, "description": "Map description", "name": "Imported map", "tilelayersControl": true, "onLoadPanel": "caption", "displayPopupFooter": true, "miniMap": true, "moreControl": true, "scaleControl": true, "zoomControl": true, "scrollWheelZoom": true, "datalayersControl": true, "zoom": 6 }, "layers": [{ "type": "FeatureCollection", "features": [{ "type": "Feature", "geometry": { "type": "Polygon", "coordinates": [ [ [4.2939, 50.8893], [4.2441, 50.8196], [4.3869, 50.7642], [4.4813, 50.7929], [4.413, 50.9119], [4.2939, 50.8893] ] ] }, "properties": { "name": "Bruxelles", "description": "polygon" } }, { "type": "Feature", "geometry": { "type": "Point", "coordinates": [3.0528, 50.6269] }, "properties": { "_umap_options": { "color": "Orange" }, "name": "Lille", "description": "une ville" } }], "_umap_options": { "displayOnLoad": true, "name": "Cities", "id": 108, "remoteData": {}, "description": "A layer with some cities", "color": "Navy", "iconClass": "Drop", "smoothFactor": "1", "dashArray": "5,1", "fillOpacity": "0.5", "fillColor": "Blue", "fill": true } }, { "type": "FeatureCollection", "features": [{ "type": "Feature", "geometry": { "type": "LineString", "coordinates": [ [1.7715, 50.9255], [1.6589, 50.9696], [1.4941, 51.0128], [1.4199, 51.0638], [1.2881, 51.1104] ] }, "properties": { "_umap_options": { "weight": "4" }, "name": "tunnel sous la Manche" } }], "_umap_options": { "displayOnLoad": true, "name": "Tunnels", "id": 109, "remoteData": {} } }]}'
-      formatSelect.value = 'umap'
-      submit = qs('.umap-upload input[type="button"]')
-      happen.click(submit)
-      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 map.datalayers) {
-        var datalayer = map.datalayers[idx]
-        if (datalayer.options.name === 'Cities') {
-          foundFirstLayer = true
-          assert.equal(datalayer._index.length, 2)
-        }
-        if (datalayer.options.name === 'Tunnels') {
-          foundSecondLayer = true
-          assert.equal(datalayer._index.length, 1)
-        }
-      }
-      assert.equal(foundFirstLayer, true)
-      assert.equal(foundSecondLayer, true)
-    })
-
-    it('should only import options on the whitelist (umap format import)', function () {
-      assert.equal(map.options.umap_id, 99)
-    })
-
-    it('should update title bar (umap format import)', function () {
-      var title = qs('#map div.umap-main-edit-toolbox button.map-name')
-      assert.equal(title.innerHTML, 'Imported map')
-    })
-
-    it('should reinitialize controls (umap format import)', function () {
-      var minimap = qs('#map div.leaflet-control-container div.leaflet-control-minimap')
-      assert.ok(minimap)
-    })
-
-    it('should update the tilelayer switcher control (umap format import)', function () {
-      //The tilelayer in the imported data isn't in the tilelayer list (set in _pre.js), there should be no selection on the tilelayer switcher
-      var selectedLayer = qs('.umap-tilelayer-switcher-container li.selected')
-      assert.equal(selectedLayer, null)
-    })
-
-    it('should set the tilelayer (umap format import)', function () {
-      assert.equal(
-        map.selected_tilelayer._url,
-        'http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg'
-      )
-    })
-  })
-
   describe('#localizeUrl()', function () {
     it('should replace known variables', function () {
       assert.equal(