umap-project 2.1.2__py3-none-any.whl → 2.2.0__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/TableEditor.js

@@ -27,16 +27,16 @@ describe('L.TableEditor', () => {
 
     it('should exist table click on edit mode', () => {
       button = qs(
-        '#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-table-edit'
+        '#browse_data_toggle_' + L.stamp(datalayer) + ' .icon-table'
       )
       expect(button).to.be.ok
     })
 
     it('should open table button click', () => {
       happen.click(button)
-      expect(qs('#umap-ui-container div.table')).to.be.ok
-      expect(qsa('#umap-ui-container div.table form').length).to.eql(3) // One per feature.
-      expect(qsa('#umap-ui-container div.table input').length).to.eql(3) // One per feature and per property.
+      expect(qs('.panel.full.on div.table')).to.be.ok
+      expect(qsa('.panel.full.on div.table form').length).to.eql(3) // One per feature.
+      expect(qsa('.panel.full.on div.table input').length).to.eql(3) // One per feature and per property.
     })
   })
   describe('#properties()', () => {
@@ -53,10 +53,10 @@ describe('L.TableEditor', () => {
       }
       var oldPrompt = window.prompt
       window.prompt = newPrompt
-      var button = qs('#umap-ui-container .add-property')
+      var button = qs('.panel.full.on .add-property')
       expect(button).to.be.ok
       happen.click(button)
-      expect(qsa('#umap-ui-container div.table input').length).to.eql(6) // One per feature and per property.
+      expect(qsa('.panel.full.on div.table input').length).to.eql(6) // One per feature and per property.
       window.prompt = oldPrompt
     })
 
@@ -74,10 +74,10 @@ describe('L.TableEditor', () => {
       }
       var oldPrompt = window.prompt
       window.prompt = newPrompt
-      var button = qs('#umap-ui-container div.thead div.tcell:last-of-type .umap-edit')
+      var button = qs('.panel.full.on div.thead div.tcell:last-of-type .umap-edit')
       expect(button).to.be.ok
       happen.click(button)
-      expect(qsa('#umap-ui-container div.table input').length).to.eql(6)
+      expect(qsa('.panel.full.on div.table input').length).to.eql(6)
       expect(feature.properties.newprop).to.be.undefined
       expect(feature.properties.newname).to.eql('the value')
       window.prompt = oldPrompt
@@ -91,12 +91,12 @@ describe('L.TableEditor', () => {
       oldConfirm = window.confirm
       window.confirm = newConfirm
       var button = qs(
-        '#umap-ui-container div.thead div.tcell:last-of-type .umap-delete'
+        '.panel.full.on div.thead div.tcell:last-of-type .umap-delete'
       )
       expect(button).to.be.ok
       happen.click(button)
       FEATURE = feature
-      expect(qsa('#umap-ui-container div.table input').length).to.eql(3)
+      expect(qsa('.panel.full.on div.table input').length).to.eql(3)
       expect(feature.properties.newname).to.be.undefined
       window.confirm = oldConfirm
     })