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

umap/static/umap/test/Polyline.js

@@ -1,4 +1,4 @@
-describe('L.U.Polyline', function () {
+describe('U.Polyline', function () {
   var p2ll, map
 
   before(function () {
@@ -22,7 +22,7 @@ describe('L.U.Polyline', function () {
 
   describe('#isMulti()', function () {
     it('should return false for basic Polyline', function () {
-      var layer = new L.U.Polyline(
+      var layer = new U.Polyline(
         this.map,
         [
           [1, 2],
@@ -35,7 +35,7 @@ describe('L.U.Polyline', function () {
     })
 
     it('should return false for nested basic Polyline', function () {
-      var layer = new L.U.Polyline(
+      var layer = new U.Polyline(
         this.map,
         [
           [
@@ -66,7 +66,7 @@ describe('L.U.Polyline', function () {
           ],
         ],
       ]
-      var layer = new L.U.Polyline(this.map, latLngs, { datalayer: this.datalayer })
+      var layer = new U.Polyline(this.map, latLngs, { datalayer: this.datalayer })
       assert.ok(layer.isMulti())
     })
   })
@@ -83,7 +83,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 100), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -92,7 +92,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to remove shape when not multi', function () {
         var latlngs = [[p2ll(100, 100), p2ll(100, 200)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -101,7 +101,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to isolate shape when not multi', function () {
         var latlngs = [[p2ll(100, 100), p2ll(100, 200)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -113,7 +113,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 150), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -125,7 +125,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 150), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -134,7 +134,7 @@ describe('L.U.Polyline', function () {
 
       it('should allow to transform to polygon when not multi', function () {
         var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -142,7 +142,7 @@ describe('L.U.Polyline', function () {
       })
 
       it('should not allow to transfer shape when not editedFeature', function () {
-        var layer = new L.U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
+        var layer = new U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -150,10 +150,10 @@ describe('L.U.Polyline', function () {
       })
 
       it('should not allow to transfer shape when editedFeature is not a line', function () {
-        var layer = new L.U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
+        var layer = new U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
             datalayer: this.datalayer,
           }).addTo(this.datalayer),
-          other = new L.U.Polygon(
+          other = new U.Polygon(
             this.map,
             [p2ll(200, 300), p2ll(300, 200), p2ll(200, 100)],
             { datalayer: this.datalayer }
@@ -164,12 +164,12 @@ describe('L.U.Polyline', function () {
       })
 
       it('should allow to transfer shape when another line is edited', function () {
-        var layer = new L.U.Polyline(
+        var layer = new U.Polyline(
             this.map,
             [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
             { datalayer: this.datalayer }
           ).addTo(this.datalayer),
-          other = new L.U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
+          other = new U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         other.edit()
@@ -184,7 +184,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 100), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -193,7 +193,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to merge lines when not multi', function () {
         var latlngs = [[p2ll(100, 100), p2ll(100, 200)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -202,7 +202,7 @@ describe('L.U.Polyline', function () {
 
       it('should allow to split lines when clicking on vertex', function () {
         var latlngs = [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         layer.enableEdit()
@@ -212,7 +212,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to split lines when clicking on first vertex', function () {
         var latlngs = [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         layer.enableEdit()
@@ -223,7 +223,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to split lines when clicking on last vertex', function () {
         var latlngs = [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         layer.enableEdit()
@@ -240,7 +240,7 @@ describe('L.U.Polyline', function () {
     })
 
     it('"add shape" control should be visible when editing a Polyline', function () {
-      var layer = new L.U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
+      var layer = new U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
         datalayer: this.datalayer,
       }).addTo(this.datalayer)
       layer.edit()
@@ -248,7 +248,7 @@ describe('L.U.Polyline', function () {
     })
 
     it('"add shape" control should extend the same multi', function () {
-      var layer = new L.U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
+      var layer = new U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
         datalayer: this.datalayer,
       }).addTo(this.datalayer)
       layer.edit()
@@ -267,10 +267,10 @@ describe('L.U.Polyline', function () {
   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 L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer),
-        other = new L.U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
+        other = new U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.ok(this.map.hasLayer(layer))
@@ -285,10 +285,10 @@ describe('L.U.Polyline', function () {
           [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
           [p2ll(200, 300), p2ll(300, 200)],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer),
-        other = new L.U.Polyline(this.map, [p2ll(250, 300), p2ll(350, 200)], {
+        other = new U.Polyline(this.map, [p2ll(250, 300), p2ll(350, 200)], {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.ok(this.map.hasLayer(layer))
@@ -312,7 +312,7 @@ describe('L.U.Polyline', function () {
             [0, 2],
           ],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       layer.mergeShapes()
@@ -336,7 +336,7 @@ describe('L.U.Polyline', function () {
             [0, 1],
           ],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       layer.mergeShapes()
@@ -352,7 +352,7 @@ describe('L.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 L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.equal(this.datalayer._index.length, 1)
@@ -367,7 +367,7 @@ describe('L.U.Polyline', function () {
           [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
           [[p2ll(200, 300), p2ll(300, 200)]],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.equal(this.datalayer._index.length, 1)
@@ -386,7 +386,7 @@ describe('L.U.Polyline', function () {
   describe('#clone', function () {
     it('should clone polyline', function () {
       var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.equal(this.datalayer._index.length, 1)

umap/static/umap/test/TableEditor.js

@@ -1,50 +1,54 @@
-describe('L.TableEditor', function () {
-  var path = '/map/99/datalayer/edit/62/'
+describe('L.TableEditor', () => {
+  let path = '/map/99/datalayer/edit/62/',
+    datalayer
 
-  before(function () {
-    this.server = sinon.fakeServer.create()
-    this.server.respondWith(
+  before(async  () => {
+    await fetchMock.mock(
       /\/datalayer\/62\/\?.*/,
       JSON.stringify(RESPONSES.datalayer62_GET)
     )
-    this.map = initMap({ umap_id: 99 })
-    this.datalayer = this.map.getDataLayerByUmapId(62)
-    this.server.respond()
+    this.options = {
+      umap_id: 99,
+    }
+    map = initMap({ umap_id: 99 })
+    const datalayer_options = defaultDatalayerData()
+    await map.initDataLayers([datalayer_options])
+    datalayer = map.getDataLayerByUmapId(62)
     enableEdit()
   })
-  after(function () {
+  after(() => {
+    fetchMock.restore()
     clickCancel()
-    this.server.restore()
     resetMap()
   })
 
-  describe('#open()', function () {
+  describe('#open()', () => {
     var button
 
-    it('should exist table click on edit mode', function () {
+    it('should exist table click on edit mode', () => {
       button = qs(
-        '#browse_data_toggle_' + L.stamp(this.datalayer) + ' .layer-table-edit'
+        '#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-table-edit'
       )
       expect(button).to.be.ok
     })
 
-    it('should open table button click', function () {
+    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.
     })
   })
-  describe('#properties()', function () {
+  describe('#properties()', () => {
     var feature
 
-    before(function () {
-      var firstIndex = this.datalayer._index[0]
-      feature = this.datalayer._layers[firstIndex]
+    before(() => {
+      var firstIndex = datalayer._index[0]
+      feature = datalayer._layers[firstIndex]
     })
 
-    it('should create new property column', function () {
-      var newPrompt = function () {
+    it('should create new property column', () => {
+      var newPrompt = () => {
         return 'newprop'
       }
       var oldPrompt = window.prompt
@@ -56,7 +60,7 @@ describe('L.TableEditor', function () {
       window.prompt = oldPrompt
     })
 
-    it('should populate feature property on fill', function () {
+    it('should populate feature property on fill', () => {
       var input = qs(
         'form#umap-feature-properties_' + L.stamp(feature) + ' input[name=newprop]'
       )
@@ -64,8 +68,8 @@ describe('L.TableEditor', function () {
       expect(feature.properties.newprop).to.eql('the value')
     })
 
-    it('should update property name on update click', function () {
-      var newPrompt = function () {
+    it('should update property name on update click', () => {
+      var newPrompt = () => {
         return 'newname'
       }
       var oldPrompt = window.prompt
@@ -79,9 +83,9 @@ describe('L.TableEditor', function () {
       window.prompt = oldPrompt
     })
 
-    it('should update property on delete click', function () {
+    it('should update property on delete click', () => {
       var oldConfirm,
-        newConfirm = function () {
+        newConfirm = () => {
           return true
         }
       oldConfirm = window.confirm

umap/static/umap/test/_pre.js

@@ -132,7 +132,7 @@ function initMap(options) {
         map_update_permissions: '/map/{map_id}/update/permissions/',
         map_download: '/map/{map_id}/download/',
       },
-      default_iconUrl: '../src/img/marker.png',
+      default_iconUrl: '../src/img/marker.svg',
       zoom: 6,
       share_statuses: [
         [1, 'Tout le monde (public)'],
@@ -213,14 +213,13 @@ function initMap(options) {
       },
     },
   }
-  default_options.properties.datalayers.push(defaultDatalayerData())
   options = options || {}
   options.properties = L.extend({}, default_options.properties, options)
   options.geometry = {
     type: 'Point',
     coordinates: [5.0592041015625, 52.05924589011585],
   }
-  return new L.U.Map('map', options)
+  return new U.Map('map', options)
 }
 
 var RESPONSES = {
@@ -386,10 +385,6 @@ var RESPONSES = {
   },
 }
 
-sinon.fakeServer.flush = function () {
-  this.responses = []
-}
-
 var kml_example =
   '<?xml version="1.0" encoding="UTF-8"?>' +
   '<kml xmlns="http://www.opengis.net/kml/2.2">' +

umap/static/umap/test/index.html

@@ -35,7 +35,6 @@
     <script src="../js/umap.core.js" defer></script>
     <script src="../js/umap.autocomplete.js" defer></script>
     <script src="../js/umap.popup.js" defer></script>
-    <script src="../js/umap.xhr.js" defer></script>
     <script src="../js/umap.forms.js" defer></script>
     <script src="../js/umap.icon.js" defer></script>
     <script src="../js/umap.features.js" defer></script>
@@ -45,7 +44,6 @@
     <script src="../js/umap.controls.js" defer></script>
     <script src="../js/umap.slideshow.js" defer></script>
     <script src="../js/umap.tableeditor.js" defer></script>
-    <script src="../js/umap.browser.js" defer></script>
     <script src="../js/umap.importer.js" defer></script>
     <script src="../js/umap.share.js" defer></script>
     <script src="../js/umap.js" defer></script>
@@ -76,6 +74,10 @@
     <script src="../../../../node_modules/chai/chai.js"></script>
     <script src="../../../../node_modules/happen/happen.js"></script>
     <link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css" />
+    <script type="module">
+      import fetchMock from '../../../../node_modules/fetch-mock/esm/client.js';
+      window.fetchMock = fetchMock
+    </script>
     <script type="text/javascript">
       mocha.setup({
         ui: 'bdd',
@@ -86,7 +88,6 @@
     </script>
     <script src="./_pre.js" defer></script>
     <script src="./Map.js" defer></script>
-    <script src="./Map.Init.js" defer></script>
     <script src="./Map.Export.js" defer></script>
     <script src="./DataLayer.js" defer></script>
     <script src="./TableEditor.js" defer></script>
@@ -95,7 +96,6 @@
     <script src="./Polyline.js" defer></script>
     <script src="./Polygon.js" defer></script>
     <script src="./Util.js" defer></script>
-    <script src="./Controls.js" defer></script>
     <script src="./Permissions.js" defer></script>
     <script src="./Choropleth.js" defer></script>
     <script type="module" src="./URLs.js" defer></script>

umap/static/umap/vendors/contextmenu/leaflet.contextmenu.css

@@ -0,0 +1,54 @@
+.leaflet-contextmenu {
+    display: none;
+    box-shadow: 0 1px 7px rgba(0,0,0,0.4);
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    padding: 4px 0;
+    background-color: #fff;
+    cursor: default;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+}
+
+.leaflet-contextmenu a.leaflet-contextmenu-item {
+    display: block;
+    color: #222;
+    font-size: 12px;
+    line-height: 20px;
+    text-decoration: none;
+    padding: 0 12px;
+    border-top: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+    cursor: default;
+    outline: none;
+}
+
+.leaflet-contextmenu a.leaflet-contextmenu-item-disabled {
+    opacity: 0.5;
+}
+
+.leaflet-contextmenu a.leaflet-contextmenu-item.over {
+    background-color: #f4f4f4;
+    border-top: 1px solid #f0f0f0;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.leaflet-contextmenu a.leaflet-contextmenu-item-disabled.over {
+    background-color: inherit;
+    border-top: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+}
+
+.leaflet-contextmenu-icon {
+    margin: 2px 8px 0 0;
+    width: 16px;
+    height: 16px;
+    float: left;
+    border: 0;
+}
+
+.leaflet-contextmenu-separator {
+    border-bottom: 1px solid #ccc;
+    margin: 5px 0;
+}