umap-project 1.4.3__py3-none-any.whl → 1.5.0__py3-none-any.whl

umap/static/umap/map.css

@@ -116,9 +116,26 @@ a.umap-control-less {
     height: 23px;
     line-height: 23px;
 }
+.leaflet-control-edit-enable a:before {
+    content: ' ';
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+    vertical-align: middle;
+    background-image: url('./img/16-white.svg');
+    background-position: -52px -49px;
+}
+
 .leaflet-control-edit-enable a {
-    background-position: 0 0;
+    width: initial;
+    padding: 0 20px;
     background-color: #353c3e;
+    color: #fff;
+    background-image: none;
+    border-radius: 20px;
+    height: 36px;
+    line-height: 36px;
+    display: block;
 }
 .leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover,
 .leaflet-control-edit-enable a:hover {
@@ -203,7 +220,6 @@ ul.photon-autocomplete {
     background-image: url('./img/24.svg');
     background-size: auto auto;
 }
-.leaflet-control-edit-enable a,
 .leaflet-control-toolbar li .leaflet-toolbar-icon.dark {
     background-image: url('./img/24-white.svg');
 }
@@ -221,6 +237,31 @@ ul.photon-autocomplete {
 .manage-datalayers {
     background-position: -36px -72px;
 }
+.umap-edit-container h3:before,
+.umap-feature-properties:before,
+.umap-layer-properties-container h3:before {
+    height: 24px;
+    width: 24px;
+    background-repeat: no-repeat;
+    background-image: url('./img/16-white.svg');
+    background-size: auto auto;
+    background-position: -98px -117px;
+    content: " ";
+    vertical-align: bottom;
+    display: inline-block;
+}
+.umap-edit-container h3:before {
+    background-position: -27px -93px;
+}
+.umap-feature-properties.marker:before {
+    background-position: -72px -117px;
+}
+.umap-feature-properties.polyline:before {
+    background-position: 0 -117px;
+}
+.umap-feature-properties.polygon:before {
+    background-position: -24px -117px;
+}
 .umap-toolbar .update-map-permissions,
 .update-map-permissions {
     background-position: -36px -36px;
@@ -382,8 +423,20 @@ ul.photon-autocomplete {
     padding: 0 10px;
     min-width: 100px;
 }
-.leaflet-container a.leaflet-control-edit-cancel {
-    background-color: #C60F13;
+.leaflet-container a.leaflet-control-edit-save:before,
+.leaflet-container a.leaflet-control-edit-cancel:before {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    margin-left: 5px;
+    background-position: -50px -122px;
+    background-repeat: no-repeat;
+    background-image: url('./img/16-white.svg');
+    vertical-align: middle;
+    content: ' ';
+}
+.leaflet-container a.leaflet-control-edit-save:before {
+    background-position: -4px -25px;
 }
 .leaflet-container a.leaflet-control-edit-save {
     opacity: 0.5;
@@ -408,26 +461,6 @@ ul.photon-autocomplete {
 .umap-is-dirty a.leaflet-control-edit-disable {
     display: none;
 }
-.umap-click-to-edit {
-    color: #4a90d9;
-    font-weight: bold;
-}
-.umap-click-to-edit:after {
-    content: "\00a0";
-    background-repeat: no-repeat;
-    background-position: center center;
-    cursor: pointer;
-    width: 26px;
-    height: 100%;
-    display: inline-block;
-    background-position: -46px -41px;
-}
-.umap-click-to-edit:hover:after {
-    background-image: url('./img/16.svg');
-}
-.dark .umap-click-to-edit:hover:after {
-    background-image: url('./img/16-white.svg');
-}
 .umap-caption-bar {
     display: none;
 }
@@ -439,14 +472,43 @@ ul.photon-autocomplete {
     right: 0;
     height: 46px;
     background-color: #323737;
-    padding: 5px;
+    padding: 5px 10px;
     text-align: left;
     line-height: 36px;
     cursor: auto;
     border-bottom: 1px solid #222;
     z-index: 1000;
     opacity: 0.98;
-    color: #efefef;
+    color: #fff;
+}
+.umap-main-edit-toolbox .logo {
+    background-image: url('./img/logo_small.svg');
+    background-position: 0 center;
+    background-repeat: no-repeat;
+    width: 60px;
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+}
+.umap-main-edit-toolbox a {
+    color: #fff;
+    font-size: 1.2em;
+    vertical-align: middle;
+}
+.umap-main-edit-toolbox a:hover {
+    text-decoration: underline;
+}
+.umap-main-edit-toolbox .map-name {
+    display: inline-block;
+    max-width: 200px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    margin-right: 5px;
+    font-weight: bold;
+}
+.umap-main-edit-toolbox .share-status {
+    margin: 0 20px;
 }
 .umap-edit-enabled .umap-main-edit-toolbox {
     top: 0;
@@ -458,15 +520,8 @@ ul.photon-autocomplete {
 .umap-main-edit-toolbox h3 {
     display: inline;
 }
-.umap-main-edit-toolbox .umap-user:before {
-    content: '|';
-    color: #fff;
-    padding-right: 10px;
-    background-image: url('./img/16-white.svg');
-    background-repeat: no-repeat;
-    display: inline-block;
-    background-position: -40px -115px;
-    width: 20px;
+.umap-main-edit-toolbox .umap-user {
+    margin-right: 20px;
 }
 .umap-edit-enabled .leaflet-top {
     top: 48px;
@@ -775,17 +830,16 @@ a.add-datalayer:hover,
 /*   Features browser panel          */
 /* ********************************* */
 
+.umap-facet-search .formbox,
 .umap-browse-features > div {
     border: 1px solid #d3d3d3;
     margin-bottom: 14px;
     border-radius: 2px;
 }
-.umap-browse-features h5, .umap-filter-data h5 {
+.umap-browse-features h5, .umap-facet-search h5 {
     margin-bottom: 0;
     overflow: hidden;
     padding-left: 5px;
-}
-.umap-browse-features h5 {
     height: 30px;
     line-height: 30px;
     background-color: #eeeee0;
@@ -794,14 +848,13 @@ a.add-datalayer:hover,
 .umap-browse-features h5 span {
     margin-left: 10px;
 }
-.umap-browse-features li {
+.umap-browse-features li, .umap-facet-search li {
     padding: 2px 0;
-}
-.umap-browse-features li, .umap-filter-data li {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
+.umap-facet-search li:nth-child(even),
 .umap-browse-features li:nth-child(even) {
     background-color: #f8f8f3;
 }
@@ -830,9 +883,6 @@ a.add-datalayer:hover,
 .umap-browse-features .polygon .feature-color {
     background-position: -32px -16px;
 }
-.umap-filter-data .property-container:not(:first-child) {
-    margin-top: 14px;
-}
 .show-on-edit {
     display: none!important;
 }
@@ -1390,10 +1440,10 @@ a.add-datalayer:hover,
 .leaflet-contextmenu-icon {
     display: none;
 }
-.umap-popup-large iframe,
-.umap-popup-large img {
+.umap-popup-large iframe {
     /* See https://github.com/Leaflet/Leaflet/commit/61d746818b99d362108545c151a27f09d60960ee#commitcomment-6061847 */
-    max-width: 500px !important;
+    max-width: 100% !important;
+    min-width: 500px;
 }
 .umap-popup-content img {
     max-width: 100%;
@@ -1417,8 +1467,27 @@ a.add-datalayer:hover,
 /* Mobile */
 /* ****** */
 
+@media all and (max-width: 980px) {
+
+    .leaflet-container a.leaflet-control-edit-save,
+    .leaflet-container a.leaflet-control-edit-cancel {
+        text-indent: calc(100% - 20px);
+        width: 35px;
+        min-width: initial;
+    }
+
+    .umap-main-edit-toolbox .umap-help-button,
+    .umap-main-edit-toolbox .share-status {
+        display: none;
+    }
+
+}
 @media all and (max-width: 480px) {
 
+    .umap-main-edit-toolbox .map-name {
+        max-width: 100px;
+    }
+
     .leaflet-control-layers-expanded label {
         display: inline-block;
         margin-right: 10px;
@@ -1431,6 +1500,9 @@ a.add-datalayer:hover,
     .umap-permanent-credits-container {
         max-width: 100%;
     }
+    .umap-popup-large iframe {
+        min-width: 300px;
+    }
 }
 
 /* ****** */

umap/static/umap/test/DataLayer.js

@@ -403,22 +403,22 @@ describe('L.U.DataLayer', function () {
       assert.ok(qs('path[fill="DarkGoldenRod"]'))
     })
   })
-  describe('#advanced-filters()', function () {
+  describe('#facet-search()', function () {
     before(function () {
       this.server.respondWith(
         /\/datalayer\/63\/\?.*/,
         JSON.stringify(RESPONSES.datalayer63_GET)
       )
-      this.map.options.advancedFilterKey = 'name'
+      this.map.options.facetKey = 'name'
       this.map.createDataLayer(RESPONSES.datalayer63_GET._umap_options)
       this.server.respond()
     })
-    it('should show non browsable layer', function () {
+    it('should not impact non browsable layer', function () {
       assert.ok(qs('path[fill="SteelBlue"]'))
     })
     it('should allow advanced filter', function () {
-      this.map.openFilter()
-      assert.ok(qs('div.umap-filter-properties'))
+      this.map.openFacet()
+      assert.ok(qs('div.umap-facet-search'))
       // This one if from the normal datalayer
       // it's name is "test", so it should be hidden
       // by the filter
@@ -428,8 +428,34 @@ describe('L.U.DataLayer', function () {
       // This one comes from a non browsable layer
       // so it should not be affected by the filter
       assert.ok(qs('path[fill="SteelBlue"]'))
-      happen.click(qs('input[data-value="name poly"]'))  // Undo
+      happen.click(qs('input[data-value="name poly"]')) // Undo
+    })
+    it('should allow to control facet label', function () {
+      this.map.options.facetKey = 'name|Nom'
+      this.map.openFacet()
+      assert.ok(qs('div.umap-facet-search h5'))
+      assert.equal(qs('div.umap-facet-search h5').textContent, 'Nom')
     })
   })
+  describe('#zoomEnd', function () {
+    it('should honour the fromZoom option', function () {
+      this.map.setZoom(6, {animate: false})
+      assert.ok(qs('path[fill="none"]'))
+      this.datalayer.options.fromZoom = 6
+      this.map.setZoom(5, {animate: false})
+      assert.notOk(qs('path[fill="none"]'))
+      this.map.setZoom(6, {animate: false})
+      assert.ok(qs('path[fill="none"]'))
+    })
 
+    it('should honour the toZoom option', function () {
+      this.map.setZoom(6, {animate: false})
+      assert.ok(qs('path[fill="none"]'))
+      this.datalayer.options.toZoom = 6
+      this.map.setZoom(7, {animate: false})
+      assert.notOk(qs('path[fill="none"]'))
+      this.map.setZoom(6, {animate: false})
+      assert.ok(qs('path[fill="none"]'))
+    })
+  })
 })

umap/static/umap/test/Permissions.js

@@ -48,7 +48,7 @@ describe('L.Permissions', function () {
     var button
 
     it('should only allow editors', function () {
-      this.map.options.permissions.owner = { id: 1, url: '/url', name: 'jojo' }
+      this.map.permissions.options.owner = { id: 1, url: '/url', name: 'jojo' }
       button = qs('a.update-map-permissions')
       happen.click(button)
       expect(qs('select[name="edit_status"]')).not.to.be.ok
@@ -62,7 +62,7 @@ describe('L.Permissions', function () {
     var button
 
     it('should allow everything', function () {
-      this.map.options.permissions.owner = { id: 1, url: '/url', name: 'jojo' }
+      this.map.permissions.options.owner = { id: 1, url: '/url', name: 'jojo' }
       this.map.options.user = { id: 1, url: '/url', name: 'jojo' }
       button = qs('a.update-map-permissions')
       happen.click(button)

umap/static/umap/test/Util.js

@@ -108,35 +108,35 @@ describe('L.Util', function () {
     it('should handle image with width', function () {
       assert.equal(
         L.Util.toHTML('A simple image: {{http://osm.org/pouet.png|100}}'),
-        'A simple image: <img src="http://osm.org/pouet.png" width="100">'
+        'A simple image: <img width="100" src="http://osm.org/pouet.png">'
       )
     })
 
     it('should handle iframe', function () {
       assert.equal(
         L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html}}}'),
-        'A simple iframe: <div><iframe src="http://osm.org/pouet.html" width="100%" height="300px" frameborder="0"></iframe></div>'
+        'A simple iframe: <div><iframe height="300px" width="100%" src="http://osm.org/pouet.html" frameborder="0"></iframe></div>'
       )
     })
 
     it('should handle iframe with height', function () {
       assert.equal(
         L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200}}}'),
-        'A simple iframe: <div><iframe src="http://osm.org/pouet.html" width="100%" height="200px" frameborder="0"></iframe></div>'
+        'A simple iframe: <div><iframe height="200px" width="100%" src="http://osm.org/pouet.html" frameborder="0"></iframe></div>'
       )
     })
 
     it('should handle iframe with height and width', function () {
       assert.equal(
         L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200*400}}}'),
-        'A simple iframe: <div><iframe src="http://osm.org/pouet.html" width="400px" height="200px" frameborder="0"></iframe></div>'
+        'A simple iframe: <div><iframe height="200px" width="400px" src="http://osm.org/pouet.html" frameborder="0"></iframe></div>'
       )
     })
 
     it('should handle iframe with height with px', function () {
       assert.equal(
         L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200px}}}'),
-        'A simple iframe: <div><iframe src="http://osm.org/pouet.html" width="100%" height="200px" frameborder="0"></iframe></div>'
+        'A simple iframe: <div><iframe height="200px" width="100%" src="http://osm.org/pouet.html" frameborder="0"></iframe></div>'
       )
     })
 
@@ -145,7 +145,7 @@ describe('L.Util', function () {
         L.Util.toHTML(
           'A simple iframe: {{{https://osm.org/?url=https%3A//anotherurl.com}}}'
         ),
-        'A simple iframe: <div><iframe src="https://osm.org/?url=https%3A//anotherurl.com" width="100%" height="300px" frameborder="0"></iframe></div>'
+        'A simple iframe: <div><iframe height="300px" width="100%" src="https://osm.org/?url=https%3A//anotherurl.com" frameborder="0"></iframe></div>'
       )
     })
 
@@ -154,7 +154,7 @@ describe('L.Util', function () {
         L.Util.toHTML(
           'A double iframe: {{{https://osm.org/pouet}}}{{{https://osm.org/boudin}}}'
         ),
-        'A double iframe: <div><iframe src="https://osm.org/pouet" width="100%" height="300px" frameborder="0"></iframe></div><div><iframe src="https://osm.org/boudin" width="100%" height="300px" frameborder="0"></iframe></div>'
+        'A double iframe: <div><iframe height="300px" width="100%" src="https://osm.org/pouet" frameborder="0"></iframe></div><div><iframe height="300px" width="100%" src="https://osm.org/boudin" frameborder="0"></iframe></div>'
       )
     })
 
@@ -245,6 +245,25 @@ describe('L.Util', function () {
       )
     })
 
+    it('should accept space', function () {
+      assert.equal(
+        L.Util.greedyTemplate('A phrase with a {var iable}.', {
+          'var iable': 'value',
+        }),
+        'A phrase with a value.'
+      )
+    })
+
+    it('should accept non ascii chars', function () {
+      assert.equal(
+        L.Util.greedyTemplate('A phrase with a {Accessibilité} and {переменная}.', {
+          'Accessibilité': 'value',
+          'переменная': 'another',
+        }),
+        'A phrase with a value and another.'
+      )
+    })
+
     it('should replace even with ignore if key is found', function () {
       assert.equal(
         L.Util.greedyTemplate(