umap-project 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

umap/static/umap/map.css

@@ -445,9 +445,8 @@ ul.photon-autocomplete {
     font-size: 12px;
     border-radius: 20px;
     color: #f8f8f8;
-    height: 36px;
-    line-height: 36px;
-    min-height: 36px;
+    height: 32px;
+    line-height: 30px;
     padding: 0 20px;
 }
 .leaflet-container .leaflet-control-edit-disable:before,
@@ -466,27 +465,47 @@ ul.photon-autocomplete {
 .leaflet-container .leaflet-control-edit-disable span,
 .leaflet-container .leaflet-control-edit-save span,
 .leaflet-container .leaflet-control-edit-cancel span {
-    margin-left: 4px;
+    margin-left: 10px;
 }
 .leaflet-container .leaflet-control-edit-save:before {
-    background-position: -1px -26px;
+    background-position: -148px -2px;
 }
 .leaflet-container .leaflet-control-edit-disable:before {
     background-position: -50px -25px;
 }
 .leaflet-container .leaflet-control-edit-cancel,
 .leaflet-container .leaflet-control-edit-disable {
-    border: 1px solid #555;
+    border: 0.5px solid rgba(153, 153, 153, 0.40);
+}
+.leaflet-container .leaflet-control-edit-cancel:hover,
+.leaflet-container .leaflet-control-edit-disable:hover {
+    border: 0.5px solid rgba(153, 153, 153, 0.80);
+    text-decoration: none;
 }
 .leaflet-container .leaflet-control-edit-save {
     opacity: 0.5;
     cursor: not-allowed;
-    border: 1px solid #42ece6;
-    color: #42ece6;
+    border-radius: 16px;
+    border: 0.5px solid rgba(153, 153, 153, 0.40);
+    background: rgba(153, 153, 153, 0.10);
+}
+.dark [type="button"].leaflet-control-edit-save:hover {
+    background: rgba(153, 153, 153, 0.10);
+    text-decoration: none;
 }
 .umap-is-dirty .leaflet-control-edit-save {
     opacity: 1;
     cursor: pointer;
+    border: 0.5px solid rgba(66, 236, 230, 0.40);
+    background: rgba(66, 236, 230, 0.10);
+    color: #42ECE6;
+}
+.umap-is-dirty .leaflet-control-edit-save:before {
+    background-position: -148px -26px;
+}
+.umap-is-dirty .dark [type="button"].leaflet-control-edit-save:hover {
+    border-color: rgba(66, 236, 230, 0.80);
+    background: rgba(66, 236, 230, 0.10);
 }
 .leaflet-container .leaflet-control-edit-save,
 .leaflet-container .leaflet-control-edit-cancel,
@@ -581,6 +600,13 @@ ul.photon-autocomplete {
 .umap-main-edit-toolbox h3 {
     display: inline;
 }
+.umap-caption-bar button {
+    margin-left: 10px;
+}
+.umap-caption-bar button + button:before {
+    content: '|';
+    padding-right: 10px;
+}
 .umap-main-edit-toolbox .umap-user {
     color: #fff;
 }
@@ -705,18 +731,14 @@ ul.photon-autocomplete {
     padding: 5px 0;
     border-bottom: 1px solid #202425;
 }
-.umap-datalayer-version a {
+.umap-datalayer-version button {
     display: inline-block;
-    width: 20px;
-    height: 20px;
-    margin-left: 5px;
-    background-position: -123px -75px;
+    width: 24px;
+    min-height: 24px;
+    background-position: -122px -73px;
     background-repeat: no-repeat;
     background-image: url('./img/16-white.svg');
-    vertical-align: middle;
-    margin-right: 5px;
-    border: 1px solid #202425;
-    background-color: #2c3233;
+    margin-right: 10px;
 }
 
 
@@ -831,13 +853,13 @@ ul.photon-autocomplete {
     background-position: -119px -48px;
 }
 .umap-delete-vertex {
-    background-position: -119px -22px;
+    background-position: -119px -94px;
 }
 .umap-continue-line {
     background-position: -96px 1px;
 }
 .umap-split-line {
-    background-position: -120px 1px;
+    background-position: -119px -22px;
 }
 .umap-extract-shape-from-multi{
     background-position: -119px 2px;
@@ -1188,7 +1210,9 @@ a.add-datalayer:hover,
 .umap-popup-footer li.next:before {
     background-position: -5px -77px;
 }
-
+.umap-popup a:hover {
+    text-decoration: underline;
+}
 
 /* ************* */
 /* Marker's Icon */
@@ -1204,6 +1228,16 @@ a.add-datalayer:hover,
     text-align: center;
     line-height: 32px;
 }
+.umap-div-icon.umap-icon-active .icon_container {
+    border-radius: 5px;
+    box-shadow: 7px 10px 10px -1px black;
+    height: 36px;
+    line-height: 36px;
+    margin-left: -2px;
+    margin-top: -4px;
+    opacity: 1.0!important;
+    width: 36px;
+}
 .umap-div-icon .icon_container img {
     vertical-align: middle;
     max-width: 24px!important; /* leaflet.css has !important, so... */
@@ -1218,7 +1252,9 @@ a.add-datalayer:hover,
     position: relative;
     width: 0;
     opacity: 0.9;
-    /*box-shadow: 4px 8px 6px -3px black;*/
+}
+.umap-div-icon.umap-icon-active .icon_arrow {
+    opacity: 1.0!important;
 }
 .umap-drop-icon .icon_arrow {
     border-left: 10px solid transparent;
@@ -1230,6 +1266,13 @@ a.add-datalayer:hover,
     top: -4px;
     width: 0;
 }
+.umap-drop-icon.umap-icon-active .icon_arrow {
+    border-left-width: 12px;
+    border-right-width: 12px;
+    border-top-width: 18px;
+    left: 4px;
+    opacity: 1.0!important;
+}
 .umap-drop-icon .icon_container {
     background-color: #2470B5;
     border-radius: 16px 16px 16px 16px;
@@ -1240,6 +1283,16 @@ a.add-datalayer:hover,
     text-align: center;
     width: 32px;
 }
+.umap-drop-icon.umap-icon-active .icon_container {
+    box-shadow: 4px 11px 10px -2px black;
+    border-radius: 18px 18px 18px 18px;
+    height: 36px;
+    line-height: 36px;
+    margin-left: -2px;
+    margin-top: -6px;
+    opacity: 1.0!important;
+    width: 36px;
+}
 .umap-drop-icon .icon_container img {
     vertical-align: middle;
     max-width: 24px !important;
@@ -1254,9 +1307,18 @@ a.add-datalayer:hover,
 .umap-circle-icon {
     border: 1px solid white;
     border-radius: 10px 10px 10px 10px;
+    margin-left: -6px;
+    margin-top: -6px;
     height: 12px;
     width: 12px;
 }
+.umap-circle-icon.umap-icon-active {
+    height: 16px;
+    margin-left: -8px;
+    margin-top: -8px;
+    opacity: 1.0!important;
+    width: 16px;
+}
 .umap-ball-icon .icon_container {
     background-color: darkblue;
     background: radial-gradient(circle at 6px 38% , white -4px, darkblue 8px) repeat scroll 0 0 transparent;
@@ -1267,6 +1329,15 @@ a.add-datalayer:hover,
     text-align: center;
     width: 16px;
 }
+.umap-ball-icon.umap-icon-active .icon_container {
+    border-radius: 10px 10px 10px 10px;
+    box-shadow: 1px 23px 7px -1px black;
+    margin-left: -2px;
+    margin-top: -4px;
+    height: 20px;
+    opacity: 1.0!important;
+    width: 20px;
+}
 .umap-ball-icon .icon_arrow {
     background-color: black;
     height: 16px;
@@ -1276,6 +1347,10 @@ a.add-datalayer:hover,
     top: -1px;
     width: 2px;
 }
+.umap-icon-active {
+    z-index: 9500!important;
+    opacity: 1.0!important;
+}
 .umap-edit-enabled .readonly {
     cursor: not-allowed;
 }
@@ -1549,6 +1624,14 @@ a.add-datalayer:hover,
     height: 36px;
     line-height: 34px;
 }
+/* Links are blue by default  */
+.leaflet-container a {
+    color: #0078a8;
+}
+/* But not in controls  */
+.leaflet-bar a {
+    color: black;
+}
 
 /* ****** */
 /* Mobile */

umap/static/umap/nav.css

@@ -63,7 +63,6 @@ footer .i18n_switch {
 }
 .umap-nav .button,
 .umap-nav .button:hover {
-    color: #fff;
     text-decoration: none;
     min-width: 150px;
 }

umap/static/umap/test/Controls.js

@@ -73,7 +73,6 @@ describe('L.U.Controls', function () {
       happen.click(qs('.umap-browse-actions .umap-browse-link'))
       assert.equal(qsa('#browse_data_datalayer_62 ul li').length, 3)
     })
-
   })
 
   describe('#exportPanel()', function () {

umap/static/umap/test/Feature.js

@@ -223,6 +223,35 @@ describe('L.U.FeatureMixin', function () {
     })
   })
 
+  describe('#highlight()', function () {
+    it('should highlight marker on click', function () {
+      assert.notOk(qs('.umap-icon-active'))
+      happen.click(qs('div.leaflet-marker-icon'))
+      assert.ok(qs('.umap-icon-active'))
+      happen.click(qs('#map')) // Close popup
+      assert.notOk(qs('.umap-icon-active'))
+    })
+
+    it('should still highlight marker after hide() and show()', function () {
+      this.datalayer.hide()
+      this.datalayer.show()
+      happen.click(qs('div.leaflet-marker-icon'))
+      assert.ok(qs('.umap-icon-active'))
+    })
+
+    it('should highlight path', function () {
+      happen.click(qs('path[stroke-opacity="0.6"]'))
+      var path = qs('path[stroke-opacity="1"]')
+      assert.ok(path)
+    })
+
+    it('should highlight polygon', function () {
+      var path = qs('path[fill="DarkBlue"]')
+      happen.click(path)
+      assert.isAbove(path.attributes['fill-opacity'].value, 0.5)
+    })
+  })
+
   describe('#tooltip', function () {
     it('should have a tooltip when active and allow variables', function () {
       this.map.options.showLabel = true

umap/static/umap/test/Map.Export.js

@@ -64,6 +64,7 @@ describe('L.U.Map.Export', function () {
             properties: {
               _umap_options: {
                 fill: false,
+                opacity: 0.6,
               },
               name: 'test',
             },
@@ -93,7 +94,7 @@ describe('L.U.Map.Export', function () {
       assert.equal(content, expected)
     })
 
-    it('should export to gpx', function () {
+    it('should export to kml', function () {
       const { content, filetype, filename } = this.map.format('kml')
       assert.equal(filetype, 'application/vnd.google-earth.kml+xml')
       assert.equal(filename, 'name_of_the_map.kml')
@@ -101,131 +102,5 @@ describe('L.U.Map.Export', function () {
         '<?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://www.opengis.net/kml/2.2"><Document><Placemark><name>name poly</name><ExtendedData><Data name="name"><value>name poly</value></Data></ExtendedData><Polygon><outerBoundaryIs><LinearRing><coordinates>11.25,53.585984 10.151367,52.975108 12.689209,52.167194 14.084473,53.199452 12.634277,53.618579 11.25,53.585984 11.25,53.585984</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark><Placemark><name>test</name><ExtendedData><Data name="_umap_options"><value>[object Object]</value></Data><Data name="name"><value>test</value></Data></ExtendedData><Point><coordinates>-0.274658,52.57635</coordinates></Point></Placemark><Placemark><name>test</name><ExtendedData><Data name="_umap_options"><value>[object Object]</value></Data><Data name="name"><value>test</value></Data></ExtendedData><LineString><coordinates>-0.571289,54.476422 0.439453,54.610255 1.724854,53.448807 4.163818,53.988395 5.306396,53.533778 6.591797,53.709714 7.042236,53.350551</coordinates></LineString></Placemark></Document></kml>'
       assert.equal(content, expected)
     })
-
-    it('should export to umap', function () {
-      const { content, filetype, filename } = this.map.format('umap')
-      assert.equal(filetype, 'application/json')
-      assert.equal(filename, 'name_of_the_map.umap')
-      const expected = {
-        type: 'umap',
-        uri: null,
-        properties: {
-          easing: false,
-          embedControl: true,
-          fullscreenControl: true,
-          searchControl: true,
-          datalayersControl: true,
-          zoomControl: true,
-          permanentCreditBackground: true,
-          slideshow: {},
-          captionMenus: true,
-          captionBar: false,
-          limitBounds: {},
-          overlay: null,
-          tilelayer: {
-            attribution: 'HOT and friends',
-            name: 'HOT OSM-fr server',
-            url_template: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
-            rank: 99,
-            minZoom: 0,
-            maxZoom: 20,
-            id: 2,
-          },
-          licence: '',
-          description: 'The description of the map',
-          name: 'name of the map',
-          displayPopupFooter: false,
-          miniMap: false,
-          moreControl: true,
-          scaleControl: true,
-          scrollWheelZoom: true,
-          zoom: 6,
-        },
-        geometry: {
-          type: 'Point',
-          coordinates: [5.0592041015625, 52.05924589011585],
-        },
-        layers: [
-          {
-            type: 'FeatureCollection',
-            features: [
-              {
-                type: 'Feature',
-                properties: {
-                  name: 'name poly',
-                },
-                geometry: {
-                  type: 'Polygon',
-                  coordinates: [
-                    [
-                      [11.25, 53.585984],
-                      [10.151367, 52.975108],
-                      [12.689209, 52.167194],
-                      [14.084473, 53.199452],
-                      [12.634277, 53.618579],
-                      [11.25, 53.585984],
-                      [11.25, 53.585984],
-                    ],
-                  ],
-                },
-              },
-              {
-                type: 'Feature',
-                properties: {
-                  _umap_options: {
-                    color: 'OliveDrab',
-                  },
-                  name: 'test',
-                },
-                geometry: {
-                  type: 'Point',
-                  coordinates: [-0.274658, 52.57635],
-                },
-              },
-              {
-                type: 'Feature',
-                properties: {
-                  _umap_options: {
-                    fill: false,
-                  },
-                  name: 'test',
-                },
-                geometry: {
-                  type: 'LineString',
-                  coordinates: [
-                    [-0.571289, 54.476422],
-                    [0.439453, 54.610255],
-                    [1.724854, 53.448807],
-                    [4.163818, 53.988395],
-                    [5.306396, 53.533778],
-                    [6.591797, 53.709714],
-                    [7.042236, 53.350551],
-                  ],
-                },
-              },
-            ],
-            _umap_options: {
-              displayOnLoad: true,
-              browsable: true,
-              editMode: 'advanced',
-              iconClass: 'Default',
-              name: 'Elephants',
-              id: 62,
-              pictogram_url: null,
-              opacity: null,
-              weight: null,
-              fillColor: '',
-              color: '',
-              stroke: true,
-              smoothFactor: null,
-              dashArray: '',
-              fillOpacity: null,
-              fill: true,
-            },
-          },
-        ],
-      }
-      assert.deepEqual(JSON.parse(content), expected)
-    })
   })
 })

umap/static/umap/test/Util.js

@@ -475,6 +475,16 @@ describe('L.Util', function () {
     })
   })
 
+  describe("#normalize()", function () {
+
+    if('should remove accents', function () {
+      // French é
+      assert.equal(L.Util.normalize('aéroport'), 'aeroport')
+      // American é
+      assert.equal(L.Util.normalize('aéroport'), 'aeroport')
+    })
+  })
+
   describe("#sortFeatures()", function () {
     let feat1, feat2, feat3
     before(function () {

umap/static/umap/test/_pre.js

@@ -92,14 +92,12 @@ var defaultDatalayerData = function (custom) {
     displayOnLoad: true,
     id: 62,
     pictogram_url: null,
-    opacity: null,
     weight: null,
     fillColor: '',
     color: '',
     stroke: true,
     smoothFactor: null,
     dashArray: '',
-    fillOpacity: null,
     fill: true,
   }
   return L.extend({}, _default, custom)
@@ -132,6 +130,7 @@ function initMap(options) {
         datalayer_version: '/datalayer/{pk}/{name}',
         pictogram_list_json: '/pictogram/json/',
         map_update_permissions: '/map/{map_id}/update/permissions/',
+        map_download: '/map/{map_id}/download/',
       },
       default_iconUrl: '../src/img/marker.png',
       zoom: 6,
@@ -254,7 +253,7 @@ var RESPONSES = {
         },
         type: 'Feature',
         id: 20,
-        properties: { _umap_options: { fill: false }, name: 'test' },
+        properties: { _umap_options: { fill: false, opacity: 0.6 }, name: 'test' },
       },
       {
         geometry: {

umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js

@@ -1,4 +1,3 @@
-
 L.FormBuilder = L.Evented.extend({
 
     options: {
@@ -125,12 +124,14 @@ L.FormBuilder = L.Evented.extend({
 
 L.FormBuilder.Element = L.Evented.extend({
 
+    options: {},
+
     initialize: function (builder, field, options) {
         this.builder = builder;
         this.obj = this.builder.obj;
         this.form = this.builder.form;
         this.field = field;
-        this.options = options;
+        L.setOptions(this, options);
         this.fieldEls = this.field.split('.');
         this.name = this.builder.getName(field);
         this.parentNode = this.getParentNode();
@@ -341,10 +342,20 @@ L.FormBuilder.FloatMixin = {
 };
 
 L.FormBuilder.FloatInput = L.FormBuilder.Input.extend({
+
+    options: {
+        step: 'any'
+    },
+
     includes: [L.FormBuilder.FloatMixin]
 });
 
 L.FormBuilder.BlurFloatInput = L.FormBuilder.BlurInput.extend({
+
+    options: {
+        step: 'any'
+    },
+
     includes: [L.FormBuilder.FloatMixin]
 });