umap-project 3.2.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

umap/static/umap/js/modules/schema.js

@@ -218,6 +218,7 @@ export const SCHEMA = {
     choices: [
       ['Default', translate('Default')],
       ['Circle', translate('Circle')],
+      ['LargeCircle', translate('Large Circle')],
       ['Drop', translate('Drop')],
       ['Ball', translate('Ball')],
       ['Raw', translate('None')],
@@ -234,6 +235,17 @@ export const SCHEMA = {
     inheritable: true,
     default: 1,
   },
+  iconSize: {
+    type: Number,
+    impacts: ['data'],
+    min: 12,
+    max: 64,
+    step: 4,
+    label: translate('Icon size'),
+    helpText: translate('Will only affect raw and large circle icons.'),
+    inheritable: true,
+    default: 24,
+  },
   iconUrl: {
     type: String,
     impacts: ['data'],
@@ -438,9 +450,17 @@ export const SCHEMA = {
       ['GeoRSSLink', translate('GeoRSS (only link)')],
       ['OSM', translate('OpenStreetMap')],
       ['Wikipedia', translate('Wikipedia')],
+      ['Route', translate('Route')],
     ],
     default: 'Default',
   },
+  printControl: {
+    type: Boolean,
+    impacts: ['ui'],
+    nullable: true,
+    label: translate('Display the print control'),
+    default: null,
+  },
   rank: {
     type: Number,
     impacts: ['datalayer-rank'],
@@ -453,6 +473,10 @@ export const SCHEMA = {
     type: Object,
     impacts: ['data'],
   },
+  route: {
+    type: Object,
+    impacts: ['data'],
+  },
   scaleControl: {
     type: Boolean,
     impacts: ['ui'],

umap/static/umap/js/modules/share.js

@@ -43,7 +43,7 @@ export default class Share {
     const list = document.createElement('ul')
     list.classList.add('downloads')
     this.container.appendChild(list)
-    for (const format of Object.keys(EXPORT_FORMATS)) {
+    for (const format of Object.keys(EXPORT_FORMATS).concat('jpg', 'png')) {
       const button = Utils.loadTemplate(`
         <li>
           <button class="flat" type="button">
@@ -142,22 +142,29 @@ export default class Share {
 
   async format(mode) {
     const type = EXPORT_FORMATS[mode]
-    const content = await type.formatter(this._umap)
+    const features = this._umap.datalayers
+      .visible()
+      .reduce((acc, dl) => acc.concat(dl.features.visible()), [])
+    const content = await this._umap.formatter.stringify(features, mode)
     const filename = Utils.slugify(this._umap.properties.name) + type.ext
     return { content, filetype: type.filetype, filename }
   }
 
   async download(mode) {
-    const { content, filetype, filename } = await this.format(mode)
-    const blob = new Blob([content], { type: filetype })
-    window.URL = window.URL || window.webkitURL
-    const el = document.createElement('a')
-    el.download = filename
-    el.href = window.URL.createObjectURL(blob)
-    el.style.display = 'none'
-    document.body.appendChild(el)
-    el.click()
-    document.body.removeChild(el)
+    if (!(mode in EXPORT_FORMATS)) {
+      this._umap.openPrinter(mode)
+    } else {
+      const { content, filetype, filename } = await this.format(mode)
+      const blob = new Blob([content], { type: filetype })
+      window.URL = window.URL || window.webkitURL
+      const el = document.createElement('a')
+      el.download = filename
+      el.href = window.URL.createObjectURL(blob)
+      el.style.display = 'none'
+      document.body.appendChild(el)
+      el.click()
+      document.body.removeChild(el)
+    }
   }
 }
 

umap/static/umap/js/modules/ui/bar.js

@@ -213,7 +213,9 @@ export class BottomBar extends WithTemplate {
       const selected = select.options[select.selectedIndex].value
       if (!selected) return
       this._umap.datalayers.active().map((datalayer) => {
-        datalayer.toggle(datalayer.id === selected)
+        if (datalayer.properties.inCaption !== false) {
+          datalayer.toggle(datalayer.id === selected)
+        }
       })
     })
     this.redraw()
@@ -263,6 +265,7 @@ const EDIT_BAR_TEMPLATE = `
     <li data-ref="multipolygon" hidden>
       <button type="button" title="${translate('Add a polygon to the current multi')}"><i class="icon icon-24 icon-multipolygon"></i></button>
     </li>
+    <li data-ref="route" hidden><button type="button" data-getstarted title="${translate('Draw along routes')}"><i class="icon icon-24 icon-route"></i></button></li>
     <hr>
     <li data-ref="caption" hidden><button data-getstarted type="button" title="${translate('Edit map name and caption')}"><i class="icon icon-24 icon-caption"></i></button></li>
     <li data-ref="import" hidden><button type="button"><i class="icon icon-24 icon-upload"></i></button></li>
@@ -293,6 +296,7 @@ export class EditBar extends WithTemplate {
     this._onClick('multiline', () => this._umap.editedFeature.ui.editor.newShape())
     this._onClick('polygon', () => this._leafletMap.editTools.startPolygon())
     this._onClick('multipolygon', () => this._umap.editedFeature.ui.editor.newShape())
+    this._onClick('route', () => this._leafletMap.editTools.startRoute())
     this._onClick('caption', () => this._umap.editCaption())
     this._onClick('import', () => this._umap.importer.open())
     this._onClick('templates', () => this.templateIimporter.open())
@@ -321,6 +325,7 @@ export class EditBar extends WithTemplate {
     this.elements.center.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.permissions.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.settings.hidden = this._umap.properties.editMode !== 'advanced'
+    this.elements.route.hidden = !this._umap.properties.ORSAPIKey
   }
 
   _addTitle(ref, label) {

umap/static/umap/js/modules/ui/base.js

@@ -12,9 +12,19 @@ export class Positioned {
   }
 
   toggleClassPosition(position) {
-    this.container.classList.toggle('tooltip-bottom', position === 'bottom')
-    this.container.classList.toggle('tooltip-top', position === 'top')
-    this.container.classList.toggle('tooltip-right', position === 'right')
+    const positions = [
+      'bottom',
+      'top',
+      'left',
+      'right',
+      'bottom-right',
+      'bottom-left',
+      'top-right',
+      'top-left',
+    ]
+    for (const known of positions) {
+      this.container.classList.toggle(`tooltip-${known}`, position === known)
+    }
   }
 
   anchorTop(el) {
@@ -39,7 +49,6 @@ export class Positioned {
   anchorRight(el) {
     this.toggleClassPosition('right')
     const coords = this.getPosition(el)
-    console.log(coords)
     this.setPosition({
       left: coords.right + 11,
       top: coords.top,
@@ -71,18 +80,24 @@ export class Positioned {
   }
 
   computePosition([x, y]) {
+    let tooltip = ''
     let left
     let top
-    if (x < window.innerWidth / 2) {
-      left = x
-    } else {
-      left = x - this.container.offsetWidth
-    }
     if (y < window.innerHeight / 2) {
       top = Math.min(y, window.innerHeight - this.container.offsetHeight)
+      tooltip += 'top'
     } else {
       top = Math.max(0, y - this.container.offsetHeight)
+      tooltip += 'bottom'
+    }
+    if (x < window.innerWidth / 2) {
+      left = x
+      tooltip += '-left'
+    } else {
+      left = x - this.container.offsetWidth
+      tooltip += '-right'
     }
+    this.toggleClassPosition(tooltip)
     this.setPosition({ left, top })
   }
 

umap/static/umap/js/modules/ui/contextmenu.js

@@ -1,4 +1,4 @@
-import { loadTemplate } from '../utils.js'
+import { loadTemplate, loadTemplateWithRefs } from '../utils.js'
 import { Positioned } from './base.js'
 
 export default class ContextMenu extends Positioned {
@@ -29,16 +29,21 @@ export default class ContextMenu extends Positioned {
     this.openAt([coords.left, coords.bottom], items)
   }
 
-  openAt([left, top], items) {
-    this.container.innerHTML = ''
+  addItems(items, container) {
     for (const item of items) {
       if (item === '-') {
-        this.container.appendChild(document.createElement('hr'))
+        container.appendChild(document.createElement('hr'))
+      } else if (item.items) {
+        const [li, { bar }] = loadTemplateWithRefs(
+          `<li class="dark"><ul data-ref=bar class="icon-bar"></ul></li>`
+        )
+        this.addItems(item.items, bar)
+        container.appendChild(li)
       } else if (typeof item.action === 'string') {
         const li = loadTemplate(
           `<li class="${item.className || ''}"><a tabindex="0" href="${item.action}">${item.label}</a></li>`
         )
-        this.container.appendChild(li)
+        container.appendChild(li)
       } else {
         let content = item.label || ''
         if (item.icon) {
@@ -51,9 +56,14 @@ export default class ContextMenu extends Positioned {
           this.close()
           item.action()
         })
-        this.container.appendChild(li)
+        container.appendChild(li)
       }
     }
+  }
+
+  openAt([left, top], items) {
+    this.container.innerHTML = ''
+    this.addItems(items, this.container)
     // When adding contextmenu below the map container, clicking on any link will send the
     // "focusout" element on link click, preventing to trigger the click action
     const parent = document
@@ -65,7 +75,7 @@ export default class ContextMenu extends Positioned {
     } else {
       this.computePosition([left, top])
     }
-    this.container.querySelector('li > *').focus()
+    this.container.querySelector('button, a').focus()
     this.container.addEventListener(
       'keydown',
       (event) => {

umap/static/umap/js/modules/ui/dialog.js

@@ -37,7 +37,8 @@ export default class Dialog extends WithTemplate {
     this.init()
   }
 
-  collectFormData(formData) {
+  collectFormData() {
+    const formData = new FormData(this.elements.form)
     const object = {}
     formData.forEach((value, key) => {
       if (!Reflect.has(object, key)) {
@@ -145,6 +146,10 @@ export default class Dialog extends WithTemplate {
     return this.waitForUser()
   }
 
+  on(...args) {
+    this.dialog.addEventListener(...args)
+  }
+
   close() {
     this.toggle(false)
     this.dialog.returnValue = undefined
@@ -171,9 +176,7 @@ export default class Dialog extends WithTemplate {
         'close',
         (event) => {
           if (this.dialog.returnValue === 'accept') {
-            const value = this.hasFormData
-              ? this.collectFormData(new FormData(this.elements.form))
-              : true
+            const value = this.hasFormData ? this.collectFormData() : true
             resolve(value)
           }
         },

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

@@ -33,6 +33,7 @@ import Tooltip from './ui/tooltip.js'
 import URLs from './urls.js'
 import * as Utils from './utils.js'
 import { DataLayerManager } from './managers.js'
+import { Importer as OpenRouteService } from './importers/openrouteservice.js'
 
 export default class Umap {
   constructor(element, geojson) {
@@ -128,7 +129,6 @@ export default class Umap {
     )
     this.tooltip = new Tooltip(this._leafletMap._controlContainer)
     this.contextmenu = new ContextMenu()
-    this.editContextmenu = new ContextMenu({ className: 'dark', orientation: 'rows' })
     this.server = new ServerRequest()
     this.request = new Request()
     this.facets = new Facets(this)
@@ -210,7 +210,7 @@ export default class Umap {
 
     if (!this.properties.noControl) {
       this.initShortcuts()
-      this._leafletMap.on('contextmenu', (e) => this.onContextMenu(e))
+      this._leafletMap.on('contextmenu', (event) => this.onContextMenu(event))
       this.onceDataLoaded(this.setViewFromQueryString)
       this.bottomBar.setup()
       this.propagate()
@@ -391,48 +391,28 @@ export default class Umap {
     }
   }
 
-  getOwnContextMenuItems(event) {
+  getOwnContextMenu(event) {
     const items = []
-    if (this.hasEditMode()) {
-      if (this.editEnabled) {
-        if (!this.isDirty) {
-          items.push({
-            label: this.help.displayLabel('STOP_EDIT'),
-            action: () => this.disableEdit(),
-          })
-        }
-        if (this.properties.enableMarkerDraw) {
-          items.push({
-            label: this.help.displayLabel('DRAW_MARKER'),
+    if (this.editEnabled) {
+      items.push({
+        items: [
+          {
+            title: this.help.displayLabel('DRAW_MARKER', false),
+            icon: 'icon-marker',
             action: () => this._leafletMap.editTools.startMarker(),
-          })
-        }
-        if (this.properties.enablePolylineDraw) {
-          items.push({
-            label: this.help.displayLabel('DRAW_POLYGON'),
-            action: () => this._leafletMap.editTools.startPolygon(),
-          })
-        }
-        if (this.properties.enablePolygonDraw) {
-          items.push({
-            label: this.help.displayLabel('DRAW_LINE'),
+          },
+          {
+            title: this.help.displayLabel('DRAW_LINE', false),
+            icon: 'icon-polyline',
             action: () => this._leafletMap.editTools.startPolyline(),
-          })
-        }
-        items.push('-')
-        items.push({
-          label: translate('Help'),
-          action: () => this.help.show('edit'),
-        })
-      } else {
-        items.push({
-          label: this.help.displayLabel('TOGGLE_EDIT'),
-          action: () => this.enableEdit(),
-        })
-      }
-    }
-    if (items.length) {
-      items.push('-')
+          },
+          {
+            title: this.help.displayLabel('DRAW_POLYGON', false),
+            icon: 'icon-polygon',
+            action: () => this._leafletMap.editTools.startPolygon(),
+          },
+        ],
+      })
     }
     items.push(
       {
@@ -463,27 +443,32 @@ export default class Umap {
     return items
   }
 
-  getSharedContextMenuItems(event) {
+  getSharedContextMenu(event) {
     const items = []
     if (this.properties.urls.routing) {
-      items.push('-', {
+      items.push({
         label: translate('Directions from here'),
         action: () => this.openExternalRouting(event),
       })
     }
+    if (this.properties.ORSAPIKey) {
+      items.push({
+        label: translate('Compute isochrone from here'),
+        action: () => this.askForIsochrone(event),
+      })
+    }
     if (this.properties.urls.edit_in_osm) {
-      items.push('-', {
+      items.push({
         label: translate('Edit in OpenStreetMap'),
         action: () => this.editInOSM(event),
       })
     }
+    if (items.length) items.unshift('-')
     return items
   }
 
   onContextMenu(event) {
-    const items = this.getOwnContextMenuItems(event).concat(
-      this.getSharedContextMenuItems(event)
-    )
+    const items = this.getOwnContextMenu(event).concat(this.getSharedContextMenu(event))
     this.contextmenu.open(event.originalEvent, items)
   }
 
@@ -863,6 +848,7 @@ export default class Umap {
     const shapeOptions = [
       'properties.color',
       'properties.iconClass',
+      'properties.iconSize',
       'properties.iconUrl',
       'properties.iconOpacity',
       'properties.opacity',
@@ -1276,20 +1262,6 @@ export default class Umap {
     }
   }
 
-  toGeoJSON() {
-    let features = []
-    this.datalayers.active().map((datalayer) => {
-      if (datalayer.isVisible()) {
-        features = features.concat(datalayer.featuresToGeoJSON())
-      }
-    })
-    const geojson = {
-      type: 'FeatureCollection',
-      features: features,
-    }
-    return geojson
-  }
-
   enableEdit() {
     this.editBar.redraw()
     document.body.classList.add('umap-edit-enabled')
@@ -1637,8 +1609,8 @@ export default class Umap {
     for (const geojson of importedData.layers) {
       if (!geojson._umap_options && geojson._storage) {
         geojson._umap_options = geojson._storage
-        delete geojson._storage
       }
+      delete geojson._storage
       delete geojson._umap_options?.id // Never trust an id at this stage
       if (geojson._umap_options?.iconUrl?.startsWith('/')) {
         geojson._umap_options.iconUrl = remoteOrigin + geojson._umap_options.iconUrl
@@ -1746,6 +1718,12 @@ export default class Umap {
     if (url) window.open(url)
   }
 
+  async askForIsochrone(event) {
+    if (!this.properties.ORSAPIKey) return
+    const importer = new OpenRouteService(this)
+    importer.isochrone(event.latlng)
+  }
+
   setCenterAndZoom() {
     this._setCenterAndZoom(true)
     Alert.success(translate('The zoom and center have been modified.'))
@@ -1776,4 +1754,32 @@ export default class Umap {
   redo() {
     this.sync._undoManager.redo()
   }
+
+  async screenshot() {
+    const { snapdom, preCache } = await import('../../vendors/snapdom/snapdom.min.mjs')
+    const el = document.querySelector('#map')
+    await preCache(el)
+    const result = await snapdom(el, {
+      scale: 1,
+      type: 'jpg',
+      fast: false,
+      exclude: [
+        '.leaflet-control',
+        '.umap-loader',
+        '.panel',
+        '.umap-caption-bar',
+        '.umap-main-edit-toolbox',
+        '.umap-edit-bar',
+      ],
+    })
+    return result
+  }
+
+  async openPrinter(action) {
+    if (!this._printer) {
+      const Printer = (await import('./printer.js')).default
+      this._printer = new Printer(this)
+    }
+    this._printer.open(action)
+  }
 }

umap/static/umap/js/umap.controls.js

@@ -210,57 +210,6 @@ U.Search = L.PhotonSearch.extend({
   },
 })
 
-U.SearchControl = L.Control.extend({
-  options: {
-    position: 'topleft',
-  },
-
-  onAdd: function (map) {
-    this.map = map
-    const container = L.DomUtil.create('div', 'leaflet-control-search umap-control')
-    L.DomEvent.disableClickPropagation(container)
-    L.DomUtil.createButton(
-      '',
-      container,
-      L._('Search location'),
-      (e) => {
-        L.DomEvent.stop(e)
-        this.open()
-      },
-      this
-    )
-    this.layer = L.layerGroup().addTo(map)
-    return container
-  },
-
-  onRemove: function () {
-    this.layer.remove()
-  },
-
-  open: function () {
-    const options = {
-      limit: 10,
-      noResultLabel: L._('No results'),
-    }
-    if (this.map.options.photonUrl) options.url = this.map.options.photonUrl
-    const container = L.DomUtil.create('div', '')
-
-    L.DomUtil.createTitle(container, L._('Search location'), 'icon-search')
-    const input = L.DomUtil.create('input', 'photon-input', container)
-    const resultsContainer = L.DomUtil.create('div', 'photon-autocomplete', container)
-    this.search = new U.Search(this.map, input, this.layer, options)
-    const id = Math.random()
-    this.search.on('ajax:send', () => {
-      this.map.fire('dataloading', { id: id })
-    })
-    this.search.on('ajax:return', () => {
-      this.map.fire('dataload', { id: id })
-    })
-    this.search.resultsContainer = resultsContainer
-    this.map._umap.panel.open({ content: container }).then(input.focus())
-  },
-})
-
 L.Control.MiniMap.include({
   initialize: function (layer, options) {
     L.Util.setOptions(this, options)
@@ -306,7 +255,14 @@ U.Editable = L.Editable.extend({
       if (event.layer instanceof U.LeafletMarker) event.layer.feature.del()
     })
     this.on('editable:drawing:commit', function (event) {
-      if (this._umap.editedFeature !== event.layer) event.layer.feature.edit(event)
+      if (this._umap.editedFeature !== event.layer) {
+        const promise = event.layer.feature.edit(event)
+        if (event.layer.feature.isRoute?.()) {
+          promise.then((panel) => {
+            panel.scrollTo('details#edit-route')
+          })
+        }
+      }
     })
     this.on('editable:vertex:ctrlclick', (event) => {
       const index = event.vertex.getIndex()
@@ -322,13 +278,24 @@ U.Editable = L.Editable.extend({
     this.on('editable:vertex:rawclick', this.onVertexRawClick)
   },
 
-  createPolyline: function (latlngs) {
+  startRoute: function (latlng) {
+    const feature = this.createLineString()
+    feature.askForRouteSettings().then(async () => {
+      feature.ui.enableEdit(this.map).newShape(latlng)
+    })
+  },
+
+  createLineString: function () {
     const datalayer = this._umap.defaultEditDataLayer()
     const line = new U.LineString(this._umap, datalayer, {
       geometry: { type: 'LineString', coordinates: [] },
     })
     line._needs_upsert = true
-    return line.ui
+    return line
+  },
+
+  createPolyline: function (latlngs, properties = {}) {
+    return this.createLineString().ui
   },
 
   createPolygon: function (latlngs) {
@@ -372,7 +339,6 @@ U.Editable = L.Editable.extend({
       // only continue with Polylines and Polygons
       return
     }
-
     let content = L._('Drawing')
     let measure
     if (e.layer.editor._drawnLatLngs) {
@@ -422,8 +388,7 @@ U.Editable = L.Editable.extend({
   },
 
   onVertexRawClick: (e) => {
-    e.layer.onVertexRawClick(e)
-    L.DomEvent.stop(e)
+    // Do not delete the vertex on click (but on alt-click only)
     e.cancel()
   },