umap-project 3.4.0b3__py3-none-any.whl → 3.4.2__py3-none-any.whl

umap/static/umap/js/modules/importers/cadastrefr.js

@@ -1,26 +1,28 @@
-import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
 import { translate } from '../i18n.js'
 import * as Util from '../utils.js'
+import * as DOMUtils from '../domutils.js'
 import { AutocompleteCommunes } from './communesfr.js'
 
 const TEMPLATE = `
-  <h3>Cadastre</h3>
-  <p>Importer les données cadastrales d’une commune française.</p>
-  <div class="formbox">
-    <select name="theme">
-      <option value="batiments">Bâtiments</option>
-      <option value="communes">Communes</option>
-      <option value="feuilles">Feuilles</option>
-      <option value="lieux_dits">Lieux dits</option>
-      <option value="parcelles" selected>Parcelles</option>
-      <option value="prefixes_sections">Préfixes sections</option>
-      <option value="sections">Sections</option>
-      <option value="subdivisions_fiscales">Subdivisions fiscales</option>
-    </select>
-    <label id="boundary">
-    </label>
+  <div>
+    <h3>Cadastre</h3>
+    <p>Importer les données cadastrales d’une commune française.</p>
+    <div class="formbox">
+      <select name="theme" data-ref="select">
+        <option value="batiments">Bâtiments</option>
+        <option value="communes">Communes</option>
+        <option value="feuilles">Feuilles</option>
+        <option value="lieux_dits">Lieux dits</option>
+        <option value="parcelles" selected>Parcelles</option>
+        <option value="prefixes_sections">Préfixes sections</option>
+        <option value="sections">Sections</option>
+        <option value="subdivisions_fiscales">Subdivisions fiscales</option>
+      </select>
+      <label id="boundary">
+      </label>
+    </div>
   </div>
 `
 
@@ -33,9 +35,7 @@ export class Importer {
   async open(importer) {
     let boundary = null
     let boundaryName = null
-    const container = DomUtil.create('div')
-    container.innerHTML = TEMPLATE
-    const select = container.querySelector('select')
+    const [container, { select }] = DOMUtils.loadTemplateWithRefs(TEMPLATE)
     const options = {
       placeholder: 'Nom ou code INSEE…',
       url: 'https://geo.api.gouv.fr/communes?nom={q}&limit=5',

umap/static/umap/js/modules/importers/communesfr.js

@@ -1,6 +1,6 @@
-import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
 import * as Util from '../utils.js'
+import * as DOMUtils from '../domutils.js'
 
 export class AutocompleteCommunes extends SingleMixin(BaseAjax) {
   createResult(item) {
@@ -29,13 +29,12 @@ export class Importer {
   }
 
   async open(importer) {
-    const container = DomUtil.create('div')
-    DomUtil.createTitle(container, this.name)
-    DomUtil.element({
-      tagName: 'p',
-      parent: container,
-      textContent: "Importer les contours d'une commune française.",
-    })
+    const container = DOMUtils.loadTemplate(`
+      <div>
+        <h3>${this.name}</h3>
+        <p>Importer les contours d'une commune française.</p>
+      </div>
+    `)
     const options = {
       placeholder: 'Nom ou code INSEE…',
       url: 'https://geo.api.gouv.fr/communes?nom={q}&limit=5',

umap/static/umap/js/modules/importers/datasets.js

@@ -1,5 +1,5 @@
-import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../i18n.js'
+import * as DOMUtils from '../domutils.js'
 
 export class Importer {
   constructor(map, options) {
@@ -9,20 +9,20 @@ export class Importer {
   }
 
   async open(importer) {
-    const container = DomUtil.create('div', 'formbox')
-    DomUtil.element({ tagName: 'h3', textContent: this.name, parent: container })
-    const select = DomUtil.create('select', '', container)
-    const noPreset = DomUtil.element({
-      tagName: 'option',
-      parent: select,
-      value: '',
-      textContent: translate('Choose a dataset'),
-    })
+    const [container, { select }] = DOMUtils.loadTemplateWithRefs(`
+      <div class="formbox">
+        <h3>${this.name}</h3>
+        <select data-ref="select">
+          <option value="">${translate('Choose a dataset')}</option>
+        </select>
+      </div>
+    `)
+
     for (const dataset of this.choices) {
-      const option = DomUtil.create('option', '', select)
-      option.value = dataset.url
-      option.textContent = dataset.label
-      option.dataset.format = dataset.format || 'geojson'
+      const option = DOMUtils.loadTemplate(
+        `<option value="${dataset.url}" data-format="${dataset.format || 'geojson'}">${dataset.label}</option>`
+      )
+      select.appendChild(option)
     }
     const confirm = () => {
       if (select.value) {

umap/static/umap/js/modules/importers/geodatamine.js

@@ -1,8 +1,8 @@
-import { DomEvent, DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
 import { translate } from '../i18n.js'
 import * as Utils from '../utils.js'
+import * as DOMUtils from '../domutils.js'
 
 const BOUNDARY_TYPES = {
   admin_6: 'département',
@@ -14,18 +14,20 @@ const BOUNDARY_TYPES = {
 }
 
 const TEMPLATE = `
-  <h3>GeoDataMine</h3>
-  <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
-  <div class="formbox">
-    <select name="theme">
-      <option value="">${translate('Choose a theme')}</option>
-    </select>
-    <label>
-      <input type="checkbox" name="aspoint" />
-      ${translate('Simplify all geometries to points')}
-    </label>
-    <label id="boundary">
-    </label>
+  <div>
+    <h3>GeoDataMine</h3>
+    <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
+    <div class="formbox">
+      <select name="theme" data-ref="select">
+        <option value="">${translate('Choose a theme')}</option>
+      </select>
+      <label>
+        <input type="checkbox" name="aspoint" />
+        ${translate('Simplify all geometries to points')}
+      </label>
+      <label id="boundary">
+      </label>
+    </div>
   </div>
 `
 
@@ -49,20 +51,16 @@ export class Importer {
   async open(importer) {
     let boundary = null
     let boundaryName = null
-    const container = DomUtil.create('div')
-    container.innerHTML = TEMPLATE
+    const [container, { select }] = DOMUtils.loadTemplateWithRefs(TEMPLATE)
     const response = await this.umap.request.get(`${this.baseUrl}/themes`)
-    const select = container.querySelector('select')
     if (response?.ok) {
       const { themes } = await response.json()
       themes.sort((a, b) => Utils.naturalSort(a['name:fr'], b['name:fr']))
       for (const theme of themes) {
-        DomUtil.element({
-          tagName: 'option',
-          value: theme.id,
-          textContent: theme['name:fr'],
-          parent: select,
-        })
+        const option = DOMUtils.loadTemplate(
+          `<option value="${theme.id}">${theme['name:fr']}</option>`
+        )
+        select.appendChild(option)
       }
     } else {
       console.error(response)

umap/static/umap/js/modules/importers/opendata.js

@@ -63,6 +63,16 @@ const PORTALS = [
     url: 'https://admin.geospm.com',
     platform: 'prodige',
   },
+  {
+    name: 'SNCF',
+    url: 'https://ressources.data.sncf.com',
+    platform: 'opendatasoft',
+  },
+  {
+    name: 'Réseau STAR Rennes',
+    url: 'https://data.explore.star.fr',
+    platform: 'opendatasoft',
+  },
   {
     name: 'Toulouse Métropole',
     url: 'https://data.toulouse-metropole.fr',

umap/static/umap/js/modules/importers/overpass.js

@@ -1,22 +1,24 @@
-import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
 import { translate } from '../i18n.js'
+import * as DOMUtils from '../domutils.js'
 
 const TEMPLATE = `
-  <h3>Overpass</h3>
-  <label>
-    <span data-help="overpassImporter">${translate('Expression')}</span>
-    <input type="text" placeholder="amenity=drinking_water" name="tags" />
-  </label>
-  <label>
-    ${translate('Geometry mode')}
-    <select name="out">
-      <option value="geom" selected>${translate('Default')}</option>
-      <option value="center">${translate('Only geometry centers')}</option>
-    </select>
-  </label>
-  <label id="area"><span>${translate('Search area')}</span></label>
+  <div>
+    <h3>Overpass</h3>
+    <label>
+      <span data-help="overpassImporter">${translate('Expression')}</span>
+      <input type="text" placeholder="amenity=drinking_water" name="tags" data-ref="tags" />
+    </label>
+    <label>
+      ${translate('Geometry mode')}
+      <select name="out">
+        <option value="geom" selected>${translate('Default')}</option>
+        <option value="center">${translate('Only geometry centers')}</option>
+      </select>
+    </label>
+    <label data-ref="area" id="area"><span>${translate('Search area')}</span></label>
+  </div>
 `
 
 class Autocomplete extends SingleMixin(BaseAjax) {
@@ -57,12 +59,11 @@ export class Importer {
   }
 
   async open(importer) {
-    const container = DomUtil.create('div')
-    container.innerHTML = TEMPLATE
+    const [container, { area, tags }] = DOMUtils.loadTemplateWithRefs(TEMPLATE)
     if (this.expression) {
-      container.querySelector('[name=tags]').value = this.expression
+      tags.value = this.expression
     }
-    this.autocomplete = new Autocomplete(container.querySelector('#area'), {
+    this.autocomplete = new Autocomplete(area, {
       url: this.searchUrl,
       placeholder: translate(
         'Type area name, or let empty to load data in current map view'

umap/static/umap/js/modules/managers.js

@@ -7,7 +7,7 @@ export class DataLayerManager extends Object {
   active() {
     return Object.values(this)
       .filter((datalayer) => !datalayer.isDeleted)
-      .sort((a, b) => a.rank > b.rank)
+      .sort((a, b) => a.rank - b.rank)
   }
   reverse() {
     return this.active().reverse()

umap/static/umap/js/modules/permissions.js

@@ -1,4 +1,3 @@
-import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
 import { MutatingForm } from './form/builder.js'
 import { translate } from './i18n.js'
@@ -177,8 +176,11 @@ export class MapPermissions {
       Alert.info(translate('Please save the map first'))
       return
     }
-    const container = DomUtil.create('div', 'umap-edit-permissions')
-    DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
+    const container = DOMUtils.loadTemplate(`
+      <div class="umap-edit-permissions">
+        <h3><i class="icon icon-16 icon-key"></i> ${translate('Update permissions')}</h3>
+      </div>
+    `)
     if (this.isAnonymousMap()) this._editAnonymous(container)
     else this._editWithOwner(container)
     this._editDatalayers(container)

umap/static/umap/js/modules/rendering/controls.js

@@ -1,4 +1,4 @@
-import { Control } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { Control, LayerGroup } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import * as Utils from '../utils.js'
 import { translate } from '../i18n.js'
 
@@ -221,7 +221,7 @@ export const SearchControl = BaseButton.extend({
   },
 
   afterAdd(container, map) {
-    this.layer = L.layerGroup().addTo(map)
+    this.layer = new LayerGroup().addTo(map)
     this.photonOptions = {
       limit: 10,
       noResultLabel: translate('No results'),

umap/static/umap/js/modules/rendering/icon.js

@@ -237,14 +237,7 @@ const Ball = DefaultIcon.extend({
   _setIconStyles: function (img, name) {
     BaseIcon.prototype._setIconStyles.call(this, img, name)
     const color = this._getColor('color')
-    let background
-    if (L.Browser.ielt9) {
-      background = color
-    } else if (L.Browser.webkit) {
-      background = `-webkit-gradient( radial, 6 38%, 0, 6 38%, 8, from(white), to(${color}) )`
-    } else {
-      background = `radial-gradient(circle at 6px 38% , white -4px, ${color} 8px) repeat scroll 0 0 transparent`
-    }
+    const background = `radial-gradient(circle at 6px 38% , white -4px, ${color} 8px) repeat scroll 0 0 transparent`
     this.elements.ball.style.background = background
     this.elements.ball.style.opacity = this._getOpacity()
   },
@@ -309,5 +302,8 @@ export function setContrast(icon, parent, src, bgcolor) {
 }
 
 export function formatUrl(url, feature) {
-  return Utils.greedyTemplate(url || '', feature ? feature.extendedProperties() : {})
+  if (Utils.hasVar(url)) {
+    return Utils.greedyTemplate(url || '', feature ? feature.extendedProperties() : {})
+  }
+  return url
 }

umap/static/umap/js/modules/rendering/layers/base.js

@@ -53,7 +53,7 @@ export const LayerMixin = {
   },
 
   onZoomEnd() {
-    if (!this.datalayer.autoLoaded) return
+    if (!this.datalayer.autoVisibility) return
     if (!this.datalayer.showAtZoom() && this.datalayer.isVisible()) {
       this.datalayer.hide()
     }

umap/static/umap/js/modules/rendering/layers/classified.js

@@ -1,5 +1,5 @@
 import colorbrewer from '../../../../vendors/colorbrewer/colorbrewer.js'
-import { DomUtil, FeatureGroup } from '../../../../vendors/leaflet/leaflet-src.esm.js'
+import { FeatureGroup } from '../../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../../i18n.js'
 import * as Utils from '../../utils.js'
 import * as DOMUtils from '../../domutils.js'
@@ -346,7 +346,8 @@ export const Circles = FeatureGroup.extend({
   },
 
   renderLegend: function (container) {
-    const parent = DomUtil.create('ul', 'circles-layer-legend', container)
+    const parent = DOMUtils.loadTemplate('<ul class="circles-layer-legend"></ul>')
+    container.appendChild(parent)
     const color = this.datalayer.getProperty('color')
     const values = this.getValues()
     if (!values.length) return
@@ -360,14 +361,18 @@ export const Circles = FeatureGroup.extend({
       [this.options.maxPX, maxValue],
     ]
     for (const [size, label] of items) {
-      const li = DomUtil.create('li', '', parent)
-      const circleEl = DomUtil.create('span', 'circle', li)
-      circleEl.style.backgroundColor = color
-      circleEl.style.height = `${size * 2}px`
-      circleEl.style.width = `${size * 2}px`
-      circleEl.style.opacity = this.datalayer.getProperty('opacity')
-      const labelEl = DomUtil.create('span', 'label', li)
-      labelEl.textContent = label
+      parent.appendChild(
+        DOMUtils.loadTemplate(`
+        <li>
+          <span class="circle"
+                style="background-color: ${color};
+                       height: ${size * 2}px;
+                       width: ${size * 2}px;
+                       opacity: ${this.datalayer.getProperty('fillOpacity')};"></span>
+          <span class="label">${label}</span>
+        </li>
+      `)
+      )
     }
   },
 })

umap/static/umap/js/modules/rendering/layers/heat.js

@@ -102,6 +102,7 @@ export const Heat = L.HeatLayer.extend({
     }
     if (field === 'properties.heat.radius') {
       this.options.radius = this.datalayer.properties.heat.radius
+      this.redraw()
     }
     this._updateOptions()
   },

umap/static/umap/js/modules/rendering/map.js

@@ -1,12 +1,14 @@
 // Goes here all code related to Leaflet, DOM and user interactions.
 import {
   Map as BaseMap,
+  Browser,
   Control,
   DomEvent,
-  DomUtil,
   latLng,
-  latLngBounds,
+  LatLng,
+  LatLngBounds,
   setOptions,
+  TileLayer,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import DropControl from '../drop.js'
@@ -46,7 +48,6 @@ const ControlsMixin = {
     'caption',
     'locate',
     'measure',
-    'editinosm',
     'print',
     'tilelayers',
   ],
@@ -91,17 +92,9 @@ const ControlsMixin = {
     this._controls.embed = new EmbedControl(this._umap)
     this._controls.print = new PrintControl(this._umap)
     this._controls.tilelayersChooser = new TileLayerChooser(this._umap)
-    this._controls.editinosm = new Control.EditInOSM({
-      position: 'topleft',
-      widgetOptions: {
-        helpText: translate(
-          'Open this map extent in a map editor to provide more accurate data to OpenStreetMap'
-        ),
-      },
-    })
     this._controls.measure = new L.MeasureControl().initHandler(this)
     this._controls.more = new MoreControl()
-    this._controls.scale = L.control.scale()
+    this._controls.scale = new Control.Scale()
     this._controls.permanentCredit = new PermanentCreditsControl(this)
     this._umap.drop = new DropControl(this._umap, this, this._container)
     this._controls.tilelayers = new U.TileLayerControl(this)
@@ -138,11 +131,10 @@ const ControlsMixin = {
       const control = this._controls[name]
       if (!control) continue
       control.addTo(this)
-      if (status === undefined || status === null) {
-        DomUtil.addClass(control._container, 'display-on-more')
-      } else {
-        DomUtil.removeClass(control._container, 'display-on-more')
-      }
+      control._container.classList.toggle(
+        'display-on-more',
+        status === undefined || status === null
+      )
     }
     if (this._umap.getProperty('permanentCredit'))
       this._controls.permanentCredit.addTo(this)
@@ -176,7 +168,7 @@ const ManageTilelayerMixin = {
     if (this._controls) this._controls.tilelayers.setLayers()
   },
 
-  createTileLayer: (tilelayer) => new L.TileLayer(tilelayer.url_template, tilelayer),
+  createTileLayer: (tilelayer) => new TileLayer(tilelayer.url_template, tilelayer),
 
   selectTileLayer: function (tilelayer) {
     if (tilelayer === this.selectedTilelayer) {
@@ -303,7 +295,7 @@ export const LeafletMap = BaseMap.extend({
       // when scrolling the main page and touching the
       // map in an iframe. May be a bit dumb, but let's
       // try like this for now.
-      if (L.Browser.mobile) this.dragging.disable()
+      if (Browser.mobile) this.dragging.disable()
     }
     // Needs tilelayer to exist for minimap
     this.renderControls()
@@ -312,7 +304,7 @@ export const LeafletMap = BaseMap.extend({
 
   latLng: (a, b, c) => {
     // manage geojson case and call original method
-    if (!(a instanceof L.LatLng) && a.coordinates) {
+    if (!(a instanceof LatLng) && a.coordinates) {
       // Guess it's a geojson
       a = [a.coordinates[1], a.coordinates[0]]
     }
@@ -361,7 +353,7 @@ export const LeafletMap = BaseMap.extend({
       !Number.isNaN(north) &&
       !Number.isNaN(east)
     ) {
-      const bounds = latLngBounds([
+      const bounds = new LatLngBounds([
         [south, west],
         [north, east],
       ])
@@ -381,7 +373,7 @@ export const LeafletMap = BaseMap.extend({
   setMaxBounds: function (bounds) {
     // Hack. Remove me when fix is released:
     // https://github.com/Leaflet/Leaflet/pull/4494
-    bounds = latLngBounds(bounds)
+    bounds = new LatLngBounds(bounds)
 
     if (!bounds.isValid()) {
       this.options.maxBounds = null
@@ -390,6 +382,14 @@ export const LeafletMap = BaseMap.extend({
     return BaseMap.prototype.setMaxBounds.call(this, bounds)
   },
 
+  getLayersBounds: (layers) => {
+    const bounds = new LatLngBounds()
+    for (const layer of layers) {
+      bounds.extend(layer.getBounds())
+    }
+    return bounds
+  },
+
   initEditTools: function () {
     this.editTools = new U.Editable(this._umap)
   },

umap/static/umap/js/modules/rendering/popup.js

@@ -1,11 +1,11 @@
 import {
   Popup as BasePopup,
   DomEvent,
-  DomUtil,
   Path,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import Browser from '../browser.js'
 import loadTemplate from './template.js'
+import * as DOMUtils from '../domutils.js'
 
 export default function loadPopup(name) {
   switch (name) {
@@ -25,7 +25,8 @@ const Popup = BasePopup.extend({
   },
 
   loadContent: async function () {
-    const container = DomUtil.create('div', 'umap-popup')
+    const container = document.createElement('div')
+    container.classList.add('umap-popup')
     const name = this.feature.getOption('popupTemplate')
     this.content = await loadTemplate(name, this.feature, container)
     const elements = container.querySelectorAll('img,iframe')
@@ -34,7 +35,9 @@ const Popup = BasePopup.extend({
     }
     if (!elements.length && container.textContent.replace('\n', '') === '') {
       container.innerHTML = ''
-      DomUtil.add('h3', '', container, this.feature.getDisplayName())
+      container.appendChild(
+        DOMUtils.loadTemplate(`<h3>${this.feature.getDisplayName()}</h3>`)
+      )
     }
     this.setContent(container)
   },