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

umap/static/umap/test/Polygon.js

@@ -108,260 +108,4 @@ describe('U.Polygon', function () {
     })
   })
 
-  describe('#contextmenu', function () {
-    afterEach(function () {
-      // Make sure contextmenu is hidden
-      happen.once(document, { type: 'keydown', keyCode: 27 })
-    })
-
-    describe('#in edit mode', function () {
-      it('should allow to remove shape when multi', function () {
-        var latlngs = [
-            [[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]],
-            [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          ],
-          layer = new U.Polygon(map, latlngs, {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.equal(qst('Remove shape from the multi'), 1)
-      })
-
-      it('should not allow to remove shape when not multi', function () {
-        var latlngs = [[[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]]],
-          layer = new U.Polygon(map, latlngs, {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.notOk(qst('Remove shape from the multi'))
-      })
-
-      it('should not allow to isolate shape when not multi', function () {
-        var latlngs = [[[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]]],
-          layer = new U.Polygon(map, latlngs, {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.notOk(qst('Extract shape to separate feature'))
-      })
-
-      it('should allow to isolate shape when multi', function () {
-        var latlngs = [
-            [[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]],
-            [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          ],
-          layer = new U.Polygon(map, latlngs, {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.ok(qst('Extract shape to separate feature'))
-      })
-
-      it('should not allow to transform to lines when multi', function () {
-        var latlngs = [
-            [[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]],
-            [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          ],
-          layer = new U.Polygon(map, latlngs, {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.notOk(qst('Transform to lines'))
-      })
-
-      it('should not allow to transform to lines when hole', function () {
-        var latlngs = [
-            [
-              [p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)],
-              [p2ll(120, 150), p2ll(150, 180), p2ll(180, 120)],
-            ],
-          ],
-          layer = new U.Polygon(map, latlngs, {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.notOk(qst('Transform to lines'))
-      })
-
-      it('should allow to transform to lines when not multi', function () {
-        var latlngs = [[[p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)]]]
-        new U.Polygon(map, latlngs, { datalayer: datalayer }).addTo(
-          datalayer
-        )
-        happen.at('contextmenu', 150, 150)
-        assert.equal(qst('Transform to lines'), 1)
-      })
-
-      it('should not allow to transfer shape when not editedFeature', function () {
-        new U.Polygon(map, [p2ll(100, 150), p2ll(100, 200), p2ll(200, 150)], {
-          datalayer: datalayer,
-        }).addTo(datalayer)
-        happen.at('contextmenu', 110, 160)
-        assert.equal(qst('Delete this feature'), 1) // Make sure we have right clicked on the polygon.
-        assert.notOk(qst('Transfer shape to edited feature'))
-      })
-
-      it('should not allow to transfer shape when editedFeature is not a polygon', function () {
-        var layer = new U.Polygon(
-            map,
-            [p2ll(100, 150), p2ll(100, 200), p2ll(200, 150)],
-            { datalayer: datalayer }
-          ).addTo(datalayer),
-          other = new U.Polyline(map, [p2ll(200, 250), p2ll(200, 300)], {
-            datalayer: datalayer,
-          }).addTo(datalayer)
-        other.edit()
-        happen.once(layer._path, { type: 'contextmenu' })
-        assert.equal(qst('Delete this feature'), 1) // Make sure we have right clicked on the polygon.
-        assert.notOk(qst('Transfer shape to edited feature'))
-      })
-
-      it('should allow to transfer shape when another polygon is edited', function () {
-        datalayer.empty()
-        var layer = new U.Polygon(
-          map,
-          [p2ll(200, 300), p2ll(300, 200), p2ll(200, 100)],
-          { datalayer: datalayer }
-        ).addTo(datalayer)
-        layer.edit() // This moves the map to put "other" at the center.
-        var other = new U.Polygon(
-          map,
-          [p2ll(100, 150), p2ll(100, 200), p2ll(200, 150)],
-          { datalayer: datalayer }
-        ).addTo(datalayer)
-        happen.once(other._path, { type: 'contextmenu' })
-        assert.equal(qst('Transfer shape to edited feature'), 1)
-        layer.remove()
-      })
-    })
-  })
-
-  describe('#addShape', function () {
-    it('"add shape" control should not be visible by default', function () {
-      assert.notOk(qs('.umap-draw-polygon-multi'))
-    })
-
-    it('"add shape" control should be visible when editing a Polygon', function () {
-      var layer = new U.Polygon(map, [p2ll(100, 100), p2ll(100, 200)], {
-        datalayer: datalayer,
-      }).addTo(datalayer)
-      layer.edit()
-      assert.ok(qs('.umap-draw-polygon-multi'))
-    })
-
-    it('"add shape" control should extend the same multi', function () {
-      var layer = new U.Polygon(
-        map,
-        [p2ll(100, 150), p2ll(150, 200), p2ll(200, 100)],
-        { datalayer: datalayer }
-      ).addTo(datalayer)
-      layer.edit()
-      assert.notOk(layer.isMulti())
-      happen.click(qs('.umap-draw-polygon-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(datalayer._index.length, 1)
-    })
-  })
-
-  describe('#transferShape', function () {
-    it('should transfer simple polygon shape to another polygon', function () {
-      var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new U.Polygon(map, latlngs, { datalayer: datalayer }).addTo(
-          datalayer
-        ),
-        other = new U.Polygon(
-          map,
-          [p2ll(200, 350), p2ll(200, 300), p2ll(300, 200)],
-          { datalayer: datalayer }
-        ).addTo(datalayer)
-      assert.ok(map.hasLayer(layer))
-      layer.transferShape(p2ll(150, 150), other)
-      assert.equal(other._latlngs.length, 2)
-      assert.deepEqual(other._latlngs[1][0], latlngs)
-      assert.notOk(map.hasLayer(layer))
-    })
-
-    it('should transfer multipolygon shape to another polygon', function () {
-      var latlngs = [
-          [
-            [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-            [p2ll(120, 150), p2ll(150, 180), p2ll(180, 120)],
-          ],
-          [[p2ll(200, 300), p2ll(300, 200)]],
-        ],
-        layer = new U.Polygon(map, latlngs, { datalayer: datalayer }).addTo(
-          datalayer
-        ),
-        other = new U.Polygon(
-          map,
-          [p2ll(200, 350), p2ll(200, 300), p2ll(300, 200)],
-          { datalayer: datalayer }
-        ).addTo(datalayer)
-      assert.ok(map.hasLayer(layer))
-      layer.transferShape(p2ll(150, 150), other)
-      assert.equal(other._latlngs.length, 2)
-      assert.deepEqual(other._latlngs[1][0], latlngs[0][0])
-      assert.ok(map.hasLayer(layer))
-      assert.equal(layer._latlngs.length, 1)
-    })
-  })
-
-  describe('#isolateShape', function () {
-    it('should not allow to isolate simple polygon', function () {
-      var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new U.Polygon(map, latlngs, { datalayer: datalayer }).addTo(
-          datalayer
-        )
-      assert.equal(datalayer._index.length, 1)
-      assert.ok(map.hasLayer(layer))
-      layer.isolateShape(p2ll(150, 150))
-      assert.equal(layer._latlngs[0].length, 3)
-      assert.equal(datalayer._index.length, 1)
-    })
-
-    it('should isolate multipolygon shape', function () {
-      var latlngs = [
-          [
-            [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-            [p2ll(120, 150), p2ll(150, 180), p2ll(180, 120)],
-          ],
-          [[p2ll(200, 300), p2ll(300, 200)]],
-        ],
-        layer = new U.Polygon(map, latlngs, { datalayer: datalayer }).addTo(
-          datalayer
-        )
-      assert.equal(datalayer._index.length, 1)
-      assert.ok(map.hasLayer(layer))
-      var other = layer.isolateShape(p2ll(150, 150))
-      assert.equal(datalayer._index.length, 2)
-      assert.equal(other._latlngs.length, 2)
-      assert.deepEqual(other._latlngs[0], latlngs[0][0])
-      assert.ok(map.hasLayer(layer))
-      assert.ok(map.hasLayer(other))
-      assert.equal(layer._latlngs.length, 1)
-      other.remove()
-    })
-  })
-
-  describe('#clone', function () {
-    it('should clone polygon', function () {
-      var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new U.Polygon(map, latlngs, { datalayer: datalayer }).addTo(
-          datalayer
-        )
-      assert.equal(datalayer._index.length, 1)
-      other = layer.clone()
-      assert.ok(map.hasLayer(other))
-      assert.equal(datalayer._index.length, 2)
-      // Must not be the same reference
-      assert.notEqual(layer._latlngs, other._latlngs)
-      assert.equal(L.Util.formatNum(layer._latlngs[0][0].lat), other._latlngs[0][0].lat)
-      assert.equal(L.Util.formatNum(layer._latlngs[0][0].lng), other._latlngs[0][0].lng)
-    })
-  })
 })

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/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/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/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

umap/tests/fixtures/test_upload_data.umap

@@ -0,0 +1,171 @@
+{
+    "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": 20,
+            "url_template": "https://tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
+            "minZoom": 0,
+            "attribution": "map data © [[https://osm.org/copyright|OpenStreetMap contributors]] under ODbL  - Tiles © HOT",
+            "name": "OSM Humanitarian (OSM-FR)"
+        },
+        "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": {}
+            }
+        }
+    ]
+}

umap/tests/fixtures/test_upload_data_osm.json

@@ -0,0 +1,33 @@
+{
+    "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"
+            }
+        }
+    ]
+}

umap/tests/integration/conftest.py

@@ -1,6 +1,11 @@
 import pytest
 
 
+@pytest.fixture(autouse=True)
+def set_timeout(context):
+    context.set_default_timeout(5000)
+
+
 @pytest.fixture
 def login(context, settings, live_server):
     def do_login(user):

umap/tests/integration/test_anonymous_owned_map.py

@@ -92,6 +92,9 @@ def test_owner_permissions_form(map, datalayer, live_server, owner_session):
         ".datalayer-permissions select[name='edit_status'] option:checked"
     )
     expect(option).to_have_text("Inherit")
+    # Those fields should not be present in anonymous maps
+    expect(owner_session.locator(".umap-field-share_status select")).to_be_hidden()
+    expect(owner_session.locator(".umap-field-owner")).to_be_hidden()
 
 
 def test_anonymous_can_add_marker_on_editable_layer(