umap-project 2.1.2__tar.gz → 2.1.3__tar.gz

{umap_project-2.1.2 → umap_project-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 2.1.2
+Version: 2.1.3
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -31,10 +31,10 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
 Requires-Dist: hatch==1.9.4; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.14; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.15; extra == 'dev'
 Requires-Dist: mkdocs==1.5.3; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.7.1; extra == 'dev'
-Requires-Dist: ruff==0.3.3; extra == 'dev'
+Requires-Dist: ruff==0.3.4; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.24; extra == 'docker'
@@ -44,7 +44,7 @@ Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.8.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.4.4; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.0.2; extra == 'test'
+Requires-Dist: pytest==8.1.1; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project

{umap_project-2.1.2 → umap_project-2.1.3}/pyproject.toml

@@ -44,10 +44,10 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.9.4",
-  "ruff==0.3.3",
+  "ruff==0.3.4",
   "djlint==1.34.1",
   "mkdocs==1.5.3",
-  "mkdocs-material==9.5.14",
+  "mkdocs-material==9.5.15",
   "vermin==1.6.0",
   "pymdown-extensions==10.7.1",
   "isort==5.13.2",
@@ -55,7 +55,7 @@ dev = [
 test = [
   "factory-boy==3.2.1",
   "playwright>=1.39",
-  "pytest==8.0.2",
+  "pytest==8.1.1",
   "pytest-django==4.8.0",
   "pytest-playwright==0.4.4",
   "pytest-xdist>=3.5.0,<4",

umap_project-2.1.3/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.1.3"

{umap_project-2.1.2 → umap_project-2.1.3}/umap/models.py

@@ -443,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"

{umap_project-2.1.2 → umap_project-2.1.3}/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_project-2.1.2 → umap_project-2.1.3}/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_project-2.1.2 → umap_project-2.1.3}/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_project-2.1.2 → umap_project-2.1.3}/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_project-2.1.2 → umap_project-2.1.3}/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_project-2.1.3/umap/static/umap/test/Map.js

@@ -0,0 +1,37 @@
+describe('U.Map', () => {
+  let map, datalayer
+  before(async () => {
+    await fetchMock.mock(
+      /\/datalayer\/62\/\?.*/,
+      JSON.stringify(RESPONSES.datalayer62_GET)
+    )
+    this.options = {
+      umap_id: 99,
+    }
+    map = initMap({ umap_id: 99 })
+    const datalayer_options = defaultDatalayerData()
+    await map.initDataLayers([datalayer_options])
+    datalayer = map.getDataLayerByUmapId(62)
+  })
+  after(() => {
+    fetchMock.restore()
+    clickCancel()
+    resetMap()
+  })
+
+  describe('#localizeUrl()', function () {
+    it('should replace known variables', function () {
+      assert.equal(
+        map.localizeUrl('http://example.org/{zoom}'),
+        'http://example.org/' + map.getZoom()
+      )
+    })
+
+    it('should keep unknown variables', function () {
+      assert.equal(
+        map.localizeUrl('http://example.org/{unkown}'),
+        'http://example.org/{unkown}'
+      )
+    })
+  })
+})

umap_project-2.1.3/umap/static/umap/test/Polygon.js

@@ -0,0 +1,111 @@
+describe('U.Polygon', function () {
+  var p2ll, map, datalayer
+
+  before(function () {
+    map = initMap({ umap_id: 99 })
+    enableEdit()
+    p2ll = function (x, y) {
+      return map.containerPointToLatLng([x, y])
+    }
+    datalayer = map.createDataLayer()
+    datalayer.connectToMap()
+  })
+
+  after(function () {
+    clickCancel()
+    resetMap()
+  })
+
+  afterEach(function () {
+    datalayer.empty()
+  })
+
+  describe('#isMulti()', function () {
+    it('should return false for basic Polygon', function () {
+      var layer = new U.Polygon(
+        map,
+        [
+          [1, 2],
+          [3, 4],
+          [5, 6],
+        ],
+        { datalayer: datalayer }
+      )
+      assert.notOk(layer.isMulti())
+    })
+
+    it('should return false for nested basic Polygon', function () {
+      var latlngs = [[[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]]],
+        layer = new U.Polygon(map, latlngs, { datalayer: datalayer })
+      assert.notOk(layer.isMulti())
+    })
+
+    it('should return false for simple Polygon with hole', function () {
+      var layer = new U.Polygon(
+        map,
+        [
+          [
+            [1, 2],
+            [3, 4],
+            [5, 6],
+          ],
+          [
+            [7, 8],
+            [9, 10],
+            [11, 12],
+          ],
+        ],
+        { datalayer: datalayer }
+      )
+      assert.notOk(layer.isMulti())
+    })
+
+    it('should return true for multi Polygon', function () {
+      var latLngs = [
+        [
+          [
+            [1, 2],
+            [3, 4],
+            [5, 6],
+          ],
+        ],
+        [
+          [
+            [7, 8],
+            [9, 10],
+            [11, 12],
+          ],
+        ],
+      ]
+      var layer = new U.Polygon(map, latLngs, { datalayer: datalayer })
+      assert.ok(layer.isMulti())
+    })
+
+    it('should return true for multi Polygon with hole', function () {
+      var latLngs = [
+        [
+          [
+            [10, 20],
+            [30, 40],
+            [50, 60],
+          ],
+        ],
+        [
+          [
+            [0, 10],
+            [10, 10],
+            [10, 0],
+          ],
+          [
+            [2, 3],
+            [2, 4],
+            [3, 4],
+          ],
+        ],
+      ]
+      var layer = new U.Polygon(map, latLngs, { datalayer: datalayer })
+      assert.ok(layer.isMulti())
+    })
+  })
+
+})

{umap_project-2.1.2 → umap_project-2.1.3}/umap/static/umap/test/Polyline.js

@@ -234,72 +234,6 @@ describe('U.Polyline', function () {
     })
   })
 
-  describe('#addShape', function () {
-    it('"add shape" control should not be visible by default', function () {
-      assert.notOk(qs('.umap-draw-polyline-multi'))
-    })
-
-    it('"add shape" control should be visible when editing a Polyline', function () {
-      var layer = new U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
-        datalayer: this.datalayer,
-      }).addTo(this.datalayer)
-      layer.edit()
-      assert.ok(qs('.umap-draw-polyline-multi'))
-    })
-
-    it('"add shape" control should extend the same multi', function () {
-      var layer = new U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
-        datalayer: this.datalayer,
-      }).addTo(this.datalayer)
-      layer.edit()
-      assert.notOk(layer.isMulti())
-      happen.click(qs('.umap-draw-polyline-multi'))
-      happen.at('mousemove', 300, 300)
-      happen.at('click', 300, 300)
-      happen.at('mousemove', 350, 300)
-      happen.at('click', 350, 300)
-      happen.at('click', 350, 300)
-      assert.ok(layer.isMulti())
-      assert.equal(this.datalayer._index.length, 1)
-    })
-  })
-
-  describe('#transferShape', function () {
-    it('should transfer simple line shape to another line', function () {
-      var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new U.Polyline(this.map, latlngs, {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer),
-        other = new U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer)
-      assert.ok(this.map.hasLayer(layer))
-      layer.transferShape(p2ll(150, 150), other)
-      assert.equal(other._latlngs.length, 2)
-      assert.deepEqual(other._latlngs[1], latlngs)
-      assert.notOk(this.map.hasLayer(layer))
-    })
-
-    it('should transfer multi line shape to another line', function () {
-      var latlngs = [
-          [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-          [p2ll(200, 300), p2ll(300, 200)],
-        ],
-        layer = new U.Polyline(this.map, latlngs, {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer),
-        other = new U.Polyline(this.map, [p2ll(250, 300), p2ll(350, 200)], {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer)
-      assert.ok(this.map.hasLayer(layer))
-      layer.transferShape(p2ll(150, 150), other)
-      assert.equal(other._latlngs.length, 2)
-      assert.deepEqual(other._latlngs[1], latlngs[0])
-      assert.ok(this.map.hasLayer(layer))
-      assert.equal(layer._latlngs.length, 1)
-    })
-  })
-
   describe('#mergeShapes', function () {
     it('should remove duplicated join point when merging', function () {
       var latlngs = [
@@ -349,54 +283,4 @@ describe('U.Polyline', function () {
     })
   })
 
-  describe('#isolateShape', function () {
-    it('should not allow to isolate simple line', function () {
-      var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new U.Polyline(this.map, latlngs, {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer)
-      assert.equal(this.datalayer._index.length, 1)
-      assert.ok(this.map.hasLayer(layer))
-      layer.isolateShape(p2ll(150, 150))
-      assert.equal(layer._latlngs.length, 3)
-      assert.equal(this.datalayer._index.length, 1)
-    })
-
-    it('should isolate multipolyline shape', function () {
-      var latlngs = [
-          [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-          [[p2ll(200, 300), p2ll(300, 200)]],
-        ],
-        layer = new U.Polyline(this.map, latlngs, {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer)
-      assert.equal(this.datalayer._index.length, 1)
-      assert.ok(this.map.hasLayer(layer))
-      var other = layer.isolateShape(p2ll(150, 150))
-      assert.equal(this.datalayer._index.length, 2)
-      assert.equal(other._latlngs.length, 3)
-      assert.deepEqual(other._latlngs, latlngs[0])
-      assert.ok(this.map.hasLayer(layer))
-      assert.ok(this.map.hasLayer(other))
-      assert.equal(layer._latlngs.length, 1)
-      other.remove()
-    })
-  })
-
-  describe('#clone', function () {
-    it('should clone polyline', function () {
-      var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new U.Polyline(this.map, latlngs, {
-          datalayer: this.datalayer,
-        }).addTo(this.datalayer)
-      assert.equal(this.datalayer._index.length, 1)
-      other = layer.clone()
-      assert.ok(this.map.hasLayer(other))
-      assert.equal(this.datalayer._index.length, 2)
-      // Must not be the same reference
-      assert.notEqual(layer._latlngs, other._latlngs)
-      assert.equal(L.Util.formatNum(layer._latlngs[0].lat), other._latlngs[0].lat)
-      assert.equal(L.Util.formatNum(layer._latlngs[0].lng), other._latlngs[0].lng)
-    })
-  })
 })

{umap_project-2.1.2 → umap_project-2.1.3}/umap/static/umap/test/index.html

@@ -3,6 +3,7 @@
   <head>
     <title>Umap front Tests</title>
     <meta charset="utf-8" />
+    <script type="module" src="../js/modules/leaflet-configure.js" defer></script>
     <script type="module" src="../js/modules/global.js" defer></script>
 
     <script src="../vendors/editable/Path.Drag.js" defer></script>
@@ -88,15 +89,11 @@
     </script>
     <script src="./_pre.js" defer></script>
     <script src="./Map.js" defer></script>
-    <script src="./DataLayer.js" defer></script>
-    <script src="./TableEditor.js" defer></script>
     <script src="./Feature.js" defer></script>
     <script src="./Marker.js" defer></script>
     <script src="./Polyline.js" defer></script>
     <script src="./Polygon.js" defer></script>
     <script src="./Util.js" defer></script>
-    <script src="./Permissions.js" defer></script>
-    <script src="./Choropleth.js" defer></script>
     <script type="module" src="./URLs.js" defer></script>
     <style type="text/css">
         #mocha {

{umap_project-2.1.2 → umap_project-2.1.3}/umap/tests/conftest.py

@@ -5,6 +5,8 @@ import pytest
 from django.core.cache import cache
 from django.core.signing import get_cookie_signer
 
+from umap.models import Map
+
 from .base import (
     DataLayerFactory,
     LicenceFactory,
@@ -48,6 +50,13 @@ def map(licence, tilelayer):
     return MapFactory(owner=user, licence=licence)
 
 
+@pytest.fixture
+def openmap(map):
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    return map
+
+
 @pytest.fixture
 def anonymap(map):
     map.owner = None

{umap_project-2.1.2 → umap_project-2.1.3}/umap/tests/fixtures/test_upload_data.csv

@@ -1,2 +1,3 @@
 Foo,Latitude,geo_Longitude,title,description
-bar,41.34,122.86,a point somewhere,the description of this point
+bar,41.34,122.86,a point somewhere,the description of this point
+bar,43.34,121.86,a point somewhere else,the description of this other point