umap-project 2.7.0b2__py3-none-any.whl → 2.7.1__py3-none-any.whl

umap/static/umap/locale/fr.js

@@ -513,7 +513,11 @@ const locale = {
     "Type new owner's username": "Nom d'utilisateur du nouveau propriétaire",
     "Type editor's username": "Nom d'utilisateur de l'éditeur",
     "Map": "Carte",
-    "Manage collaborators": "Gérer les collaborateurs"
+    "Manage collaborators": "Gérer les collaborateurs",
+    "show/hide all layers": "montrer/masquer les calques",
+    "zoom to data extent": "zoomer sur les données",
+    "download visible data": "télécharger les données affichées",
+    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} personne(s) actuellement connectée(s) à cette carte"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -513,5 +513,9 @@
     "Type new owner's username": "Nom d'utilisateur du nouveau propriétaire",
     "Type editor's username": "Nom d'utilisateur de l'éditeur",
     "Map": "Carte",
-    "Manage collaborators": "Gérer les collaborateurs"
+    "Manage collaborators": "Gérer les collaborateurs",
+    "show/hide all layers": "montrer/masquer les calques",
+    "zoom to data extent": "zoomer sur les données",
+    "download visible data": "télécharger les données affichées",
+    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} personne(s) actuellement connectée(s) à cette carte"
 }

umap/static/umap/map.css

@@ -500,7 +500,9 @@ ul.photon-autocomplete {
 }
 .leaflet-container .leaflet-control-edit-save,
 .leaflet-container .leaflet-control-edit-cancel,
-.leaflet-container .leaflet-control-edit-disable {
+.leaflet-container .leaflet-control-edit-disable,
+.leaflet-container .leaflet-control-connected-peers
+{
     display: block;
     border: none;
     font-size: 12px;
@@ -510,9 +512,17 @@ ul.photon-autocomplete {
     line-height: 30px;
     padding: 0 20px;
 }
+.leaflet-container .leaflet-control-connected-peers,
+.dark [type="button"].leaflet-control-connected-peers:hover
+{
+    background-color: var(--color-lightCyan);
+    color: var(--color-dark);
+}
+
 .leaflet-container .leaflet-control-edit-disable:before,
 .leaflet-container .leaflet-control-edit-save:before,
-.leaflet-container .leaflet-control-edit-cancel:before {
+.leaflet-container .leaflet-control-edit-cancel:before,
+.leaflet-container .leaflet-control-connected-peers:before {
     display: inline-block;
     width: 19px;
     height: 24px;
@@ -523,9 +533,15 @@ ul.photon-autocomplete {
     content: ' ';
     text-align: center;
 }
+
+.leaflet-container .leaflet-control-connected-peers:before {
+    background-image: url('./img/16.svg');
+}
+
 .leaflet-container .leaflet-control-edit-disable span,
 .leaflet-container .leaflet-control-edit-save span,
-.leaflet-container .leaflet-control-edit-cancel span {
+.leaflet-container .leaflet-control-edit-cancel span,
+.leaflet-container .leaflet-control-connected-peers span{
     margin-inline-start: 10px;
 }
 .leaflet-container .leaflet-control-edit-save:before {
@@ -534,8 +550,12 @@ ul.photon-autocomplete {
 .leaflet-container .leaflet-control-edit-disable:before {
     background-position: -50px -25px;
 }
+.leaflet-container .leaflet-control-connected-peers:before {
+    background-position: -2px -95px;
+}
 .leaflet-container .leaflet-control-edit-cancel,
-.leaflet-container .leaflet-control-edit-disable {
+.leaflet-container .leaflet-control-edit-disable,
+.leaflet-container .leaflet-control-connected-peers{
     border: 0.5px solid rgba(153, 153, 153, 0.40);
 }
 .leaflet-container .leaflet-control-edit-cancel:hover,
@@ -913,6 +933,16 @@ a.umap-control-caption,
 .umap-caption .umap-map-author {
     padding-inline-start: 31px;
 }
+.umap-browser .main-toolbox {
+    padding-left: 4px; /* Align with toolbox below  */
+    border-top: 1px solid var(--color-mediumGray);
+    margin-top: var(--box-margin);
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+.umap-browser .main-toolbox i {
+    cursor: pointer;
+}
 
 
 /* ********************************* */
@@ -970,18 +1000,18 @@ a.umap-control-caption,
     vertical-align: middle;
 }
 
-.datalayer-legend {
+.caption-item {
     color: #555;
     padding: 6px 8px;
     box-shadow: 0 0 3px rgba(0,0,0,0.2);
     border-radius: 1px;
 }
-.datalayer-legend ul {
+.caption-item ul {
     list-style-type: none;
     padding: 0;
     margin: 0;
 }
-.datalayer-legend .circles-layer-legend {
+.caption-item .circles-layer-legend {
     padding: var(--box-padding);
 }
 .circles-layer-legend li {

umap/static/umap/unittests/hlc.js

@@ -79,9 +79,11 @@ describe('HybridLogicalClock', () => {
 
     it('should increment nn when local and remote times are equal', () => {
       const now = Date.now()
+      // mock the clock to be the same time
+      sinon.useFakeTimers(now)
       clock = new HybridLogicalClock(now, 5, 'local')
       const result = clock.receive(`${now}:7:remote`)
-      expect(result.walltime).to.equal(now)
+      expect(result.walltime).to.be.at.least(now)
       expect(result.nn).to.equal(8)
       expect(result.id).to.equal('local')
     })
@@ -100,7 +102,12 @@ describe('HybridLogicalClock', () => {
       clock = new HybridLogicalClock(now, 5, 'local')
       const result = clock.receive(`${now - 1000}:7:remote`)
       expect(result.walltime).to.be.least(now)
-      expect(result.nn).to.equal(6)
+      if (result.walltime > now) {
+        expect(result.nn).to.equal(5)
+      }
+      else {
+        expect(result.nn).to.equal(6)
+      }
       expect(result.id).to.equal('local')
     })
   })
@@ -117,7 +124,7 @@ describe('HybridLogicalClock', () => {
     const event2 = hlc.tick()
 
     // Simulate receiving a message from another node
-    const remoteEvent = hlc.receive(`${Date.now() - 50}:5:remote-id`)
+    hlc.receive(`${Date.now() - 50}:5:remote-id`)
 
     const event3 = hlc.tick()
 

umap/static/umap/unittests/utils.js

@@ -747,6 +747,30 @@ describe('Utils', () => {
     })
   })
 
+  describe('#fieldInSchema', () => {
+    it('should return true if the field is in the schema', () => {
+      assert.equal(Utils.fieldInSchema('foo', { foo: {} }), true)
+    })
+    it('should return false if the field is not in the schema', () => {
+      assert.equal(Utils.fieldInSchema('foo', { bar: {} }), false)
+    })
+    it('should return false if the schema is not provided', () => {
+      assert.equal(Utils.fieldInSchema('foo', {}), false)
+    })
+    it('should return false if the field is undefined', () => {
+      assert.equal(Utils.fieldInSchema(undefined, {}), false)
+    })
+    // check that options. is removed
+    it('should remove options. from the field', () => {
+      assert.equal(Utils.fieldInSchema('options.foo', { foo: {} }), true)
+    })
+
+    // check that subfields are removed
+    it('should remove subfields from the field', () => {
+      assert.equal(Utils.fieldInSchema('options.foo.bar', { foo: { bar: {} } }), true)
+    })
+  })
+
   describe('#parseNaiveDate', () => {
     it('should parse a date', () => {
       assert.equal(

umap/static/umap/vars.css

@@ -6,6 +6,7 @@
     --color-mediumGray: #3e4444;
     --color-darkGray: #323737;
     --color-light: white;
+    --color-dark: black;
     --color-limeGreen: #b9f5d2;
     --color-brightCyan: #46ece6;
     --color-lightCyan: #d4fbf9;
@@ -14,7 +15,7 @@
 
     --background-color: var(--color-light);
     --color-accent: var(--color-brightCyan);
-    --text-color: black;
+    --text-color: var(--color-dark);
 
     /* Buttons. */
     --button-primary-background: var(--color-waterMint);