umap-project 2.8.2__py3-none-any.whl → 2.9.0__py3-none-any.whl

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

@@ -159,16 +159,13 @@ export function toHTML(r, options) {
   r = r.replace(/\*(.*?)\*/g, '<em>$1</em>')
 
   // links
-  r = r.replace(/(\[\[http)/g, '[[h_t_t_p') // Escape for avoiding clash between [[http://xxx]] and http://xxx
-  r = r.replace(/({{http)/g, '{{h_t_t_p')
-  r = r.replace(/(=http)/g, '=h_t_t_p') // http://xxx as query string, see https://github.com/umap-project/umap/issues/607
-  r = r.replace(/(https?:[^ \<)\n]*)/g, `<a target="_${target}" href="$1">$1</a>`)
   r = r.replace(
-    /\[\[(h_t_t_ps?:[^\]|]*?)\]\]/g,
-    `<a target="_${target}" href="$1">$1</a>`
+    /(^|\s|>|\()(https?:[^ \<)\n]*)/g,
+    `$1<a target="_${target}" href="$2">$2</a>`
   )
+  r = r.replace(/\[\[(https?:[^\]|]*?)\]\]/g, `<a target="_${target}" href="$1">$1</a>`)
   r = r.replace(
-    /\[\[(h_t_t_ps?:[^|]*?)\|(.*?)\]\]/g,
+    /\[\[(https?:[^|]*?)\|(.*?)\]\]/g,
     `<a target="_${target}" href="$1">$2</a>`
   )
   r = r.replace(/\[\[([^\]|]*?)\]\]/g, `<a target="_${target}" href="$1">$1</a>`)
@@ -176,15 +173,15 @@ export function toHTML(r, options) {
 
   // iframe
   r = r.replace(
-    /{{{(h_t_t_ps?[^|{]*)}}}/g,
+    /{{{(https?[^|{]*)}}}/g,
     '<div><iframe frameborder="0" src="$1" width="100%" height="300px"></iframe></div>'
   )
   r = r.replace(
-    /{{{(h_t_t_ps?[^|{]*)\|(\d*)(px)?}}}/g,
+    /{{{(https?[^|{]*)\|(\d*)(px)?}}}/g,
     '<div><iframe frameborder="0" src="$1" width="100%" height="$2px"></iframe></div>'
   )
   r = r.replace(
-    /{{{(h_t_t_ps?[^|{]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g,
+    /{{{(https?[^|{]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g,
     '<div><iframe frameborder="0" src="$1" width="$4px" height="$2px"></iframe></div>'
   )
 
@@ -416,9 +413,11 @@ export function loadTemplate(html) {
 }
 
 export function loadTemplateWithRefs(html) {
-  const element = loadTemplate(html)
+  const template = document.createElement('template')
+  template.innerHTML = html
+  const element = template.content.firstElementChild
   const elements = {}
-  for (const node of element.querySelectorAll('[data-ref]')) {
+  for (const node of template.content.querySelectorAll('[data-ref]')) {
     elements[node.dataset.ref] = node
   }
   return [element, elements]
@@ -446,3 +445,188 @@ export function eachElement(selector, callback) {
     callback(el)
   }
 }
+
+export class WithEvents {
+  constructor() {
+    this._target = new EventTarget()
+  }
+
+  on(eventType, callback) {
+    if (typeof callback !== 'function') return
+    this._target.addEventListener(eventType, callback)
+  }
+
+  fire(eventType, detail) {
+    const event = new CustomEvent(eventType, { detail })
+    this._target.dispatchEvent(event)
+  }
+}
+
+export function isWritable(element) {
+  if (['TEXTAREA', 'INPUT'].includes(element.tagName)) return true
+  if (element.isContentEditable) return true
+  return false
+}
+
+// From https://www.joshwcomeau.com/snippets/javascript/debounce/
+export const debounce = (callback, wait) => {
+  let timeoutId = null
+
+  return (...args) => {
+    window.clearTimeout(timeoutId)
+
+    timeoutId = window.setTimeout(() => {
+      callback.apply(null, args)
+    }, wait)
+  }
+}
+
+export const COLORS = [
+  'Black',
+  'Navy',
+  'DarkBlue',
+  'MediumBlue',
+  'Blue',
+  'DarkGreen',
+  'Green',
+  'Teal',
+  'DarkCyan',
+  'DeepSkyBlue',
+  'DarkTurquoise',
+  'MediumSpringGreen',
+  'Lime',
+  'SpringGreen',
+  'Aqua',
+  'Cyan',
+  'MidnightBlue',
+  'DodgerBlue',
+  'LightSeaGreen',
+  'ForestGreen',
+  'SeaGreen',
+  'DarkSlateGray',
+  'DarkSlateGrey',
+  'LimeGreen',
+  'MediumSeaGreen',
+  'Turquoise',
+  'RoyalBlue',
+  'SteelBlue',
+  'DarkSlateBlue',
+  'MediumTurquoise',
+  'Indigo',
+  'DarkOliveGreen',
+  'CadetBlue',
+  'CornflowerBlue',
+  'MediumAquaMarine',
+  'DimGray',
+  'DimGrey',
+  'SlateBlue',
+  'OliveDrab',
+  'SlateGray',
+  'SlateGrey',
+  'LightSlateGray',
+  'LightSlateGrey',
+  'MediumSlateBlue',
+  'LawnGreen',
+  'Chartreuse',
+  'Aquamarine',
+  'Maroon',
+  'Purple',
+  'Olive',
+  'Gray',
+  'Grey',
+  'SkyBlue',
+  'LightSkyBlue',
+  'BlueViolet',
+  'DarkRed',
+  'DarkMagenta',
+  'SaddleBrown',
+  'DarkSeaGreen',
+  'LightGreen',
+  'MediumPurple',
+  'DarkViolet',
+  'PaleGreen',
+  'DarkOrchid',
+  'YellowGreen',
+  'Sienna',
+  'Brown',
+  'DarkGray',
+  'DarkGrey',
+  'LightBlue',
+  'GreenYellow',
+  'PaleTurquoise',
+  'LightSteelBlue',
+  'PowderBlue',
+  'FireBrick',
+  'DarkGoldenRod',
+  'MediumOrchid',
+  'RosyBrown',
+  'DarkKhaki',
+  'Silver',
+  'MediumVioletRed',
+  'IndianRed',
+  'Peru',
+  'Chocolate',
+  'Tan',
+  'LightGray',
+  'LightGrey',
+  'Thistle',
+  'Orchid',
+  'GoldenRod',
+  'PaleVioletRed',
+  'Crimson',
+  'Gainsboro',
+  'Plum',
+  'BurlyWood',
+  'LightCyan',
+  'Lavender',
+  'DarkSalmon',
+  'Violet',
+  'PaleGoldenRod',
+  'LightCoral',
+  'Khaki',
+  'AliceBlue',
+  'HoneyDew',
+  'Azure',
+  'SandyBrown',
+  'Wheat',
+  'Beige',
+  'WhiteSmoke',
+  'MintCream',
+  'GhostWhite',
+  'Salmon',
+  'AntiqueWhite',
+  'Linen',
+  'LightGoldenRodYellow',
+  'OldLace',
+  'Red',
+  'Fuchsia',
+  'Magenta',
+  'DeepPink',
+  'OrangeRed',
+  'Tomato',
+  'HotPink',
+  'Coral',
+  'DarkOrange',
+  'LightSalmon',
+  'Orange',
+  'LightPink',
+  'Pink',
+  'Gold',
+  'PeachPuff',
+  'NavajoWhite',
+  'Moccasin',
+  'Bisque',
+  'MistyRose',
+  'BlanchedAlmond',
+  'PapayaWhip',
+  'LavenderBlush',
+  'SeaShell',
+  'Cornsilk',
+  'LemonChiffon',
+  'FloralWhite',
+  'Snow',
+  'Yellow',
+  'LightYellow',
+  'Ivory',
+  'White',
+]

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

@@ -1,342 +1,3 @@
-U.BaseAction = L.ToolbarAction.extend({
-  initialize: function (map) {
-    this.map = map
-    if (this.options.label) {
-      this.options.tooltip = this.map._umap.help.displayLabel(
-        this.options.label,
-        (withKbdTag = false)
-      )
-    }
-    this.options.toolbarIcon = {
-      className: this.options.className,
-      tooltip: this.options.tooltip,
-    }
-    L.ToolbarAction.prototype.initialize.call(this)
-    if (this.options.helpMenu && !U.Help.MENU_ACTIONS[this.options.className])
-      U.Help.MENU_ACTIONS[this.options.className] = this
-  },
-})
-
-U.ImportAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'upload-data dark',
-    label: 'IMPORT_PANEL',
-  },
-
-  addHooks: function () {
-    this.map._umap.importer.open()
-  },
-})
-
-U.EditLayersAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'umap-control-browse dark',
-    tooltip: L._('Manage layers'),
-  },
-
-  addHooks: function () {
-    this.map._umap.editDatalayers()
-  },
-})
-
-U.EditCaptionAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'umap-control-caption dark',
-    tooltip: L._('Edit map name and caption'),
-  },
-
-  addHooks: function () {
-    this.map._umap.editCaption()
-  },
-})
-
-U.EditPropertiesAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'update-map-settings dark',
-    tooltip: L._('Map advanced properties'),
-  },
-
-  addHooks: function () {
-    this.map._umap.edit()
-  },
-})
-
-U.ChangeTileLayerAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'dark update-map-tilelayers',
-    tooltip: L._('Change tilelayers'),
-  },
-
-  addHooks: function () {
-    this.map.updateTileLayers()
-  },
-})
-
-U.UpdateExtentAction = U.BaseAction.extend({
-  options: {
-    className: 'update-map-extent dark',
-    tooltip: L._('Save this center and zoom'),
-  },
-
-  addHooks: function () {
-    this.map._umap.setCenterAndZoom()
-  },
-})
-
-U.UpdatePermsAction = U.BaseAction.extend({
-  options: {
-    className: 'update-map-permissions dark',
-    tooltip: L._('Update permissions and editors'),
-  },
-
-  addHooks: function () {
-    this.map._umap.permissions.edit()
-  },
-})
-
-U.DrawMarkerAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'umap-draw-marker dark',
-    label: 'DRAW_MARKER',
-  },
-
-  addHooks: function () {
-    this.map.editTools.startMarker()
-  },
-})
-
-U.DrawPolylineAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'umap-draw-polyline dark',
-    label: 'DRAW_LINE',
-  },
-
-  addHooks: function () {
-    this.map.editTools.startPolyline()
-  },
-})
-
-U.DrawPolygonAction = U.BaseAction.extend({
-  options: {
-    helpMenu: true,
-    className: 'umap-draw-polygon dark',
-    label: 'DRAW_POLYGON',
-  },
-
-  addHooks: function () {
-    this.map.editTools.startPolygon()
-  },
-})
-
-U.AddPolylineShapeAction = U.BaseAction.extend({
-  options: {
-    className: 'umap-draw-polyline-multi dark',
-    tooltip: L._('Add a line to the current multi'),
-  },
-
-  addHooks: function () {
-    // FIXME: smells bad
-    this.map._umap.editedFeature.ui.editor.newShape()
-  },
-})
-
-U.AddPolygonShapeAction = U.AddPolylineShapeAction.extend({
-  options: {
-    className: 'umap-draw-polygon-multi dark',
-    tooltip: L._('Add a polygon to the current multi'),
-  },
-})
-
-U.BaseFeatureAction = L.ToolbarAction.extend({
-  initialize: function (map, feature, latlng) {
-    this.map = map
-    this.feature = feature
-    this.latlng = latlng
-    L.ToolbarAction.prototype.initialize.call(this)
-    this.postInit()
-  },
-
-  postInit: () => {},
-
-  hideToolbar: function () {
-    this.map.removeLayer(this.toolbar)
-  },
-
-  addHooks: function () {
-    this.onClick({ latlng: this.latlng })
-    this.hideToolbar()
-  },
-})
-
-U.CreateHoleAction = U.BaseFeatureAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-new-hole',
-      tooltip: L._('Start a hole here'),
-    },
-  },
-
-  onClick: function (event) {
-    this.feature.ui.startHole(event)
-  },
-})
-
-U.ToggleEditAction = U.BaseFeatureAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-toggle-edit',
-      tooltip: L._('Toggle edit mode (⇧+Click)'),
-    },
-  },
-
-  onClick: function (event) {
-    if (this.feature._toggleEditing) {
-      this.feature._toggleEditing(event) // Path
-    } else {
-      this.feature.edit(event) // Marker
-    }
-  },
-})
-
-U.DeleteFeatureAction = U.BaseFeatureAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-delete-all',
-      tooltip: L._('Delete this feature'),
-    },
-  },
-
-  postInit: function () {
-    if (!this.feature.isMulti())
-      this.options.toolbarIcon.className = 'umap-delete-one-of-one'
-  },
-
-  onClick: function (e) {
-    this.feature.confirmDelete(e)
-  },
-})
-
-U.DeleteShapeAction = U.BaseFeatureAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-delete-one-of-multi',
-      tooltip: L._('Delete this shape'),
-    },
-  },
-
-  onClick: function (e) {
-    this.feature.ui.enableEdit().deleteShapeAt(e.latlng)
-  },
-})
-
-U.ExtractShapeFromMultiAction = U.BaseFeatureAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-extract-shape-from-multi',
-      tooltip: L._('Extract shape to separate feature'),
-    },
-  },
-
-  onClick: function (e) {
-    this.feature.ui.isolateShape(e.latlng)
-  },
-})
-
-U.BaseVertexAction = U.BaseFeatureAction.extend({
-  initialize: function (map, feature, latlng, vertex) {
-    this.vertex = vertex
-    U.BaseFeatureAction.prototype.initialize.call(this, map, feature, latlng)
-  },
-})
-
-U.DeleteVertexAction = U.BaseVertexAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-delete-vertex',
-      tooltip: L._('Delete this vertex (Alt+Click)'),
-    },
-  },
-
-  onClick: function () {
-    this.vertex.delete()
-  },
-})
-
-U.SplitLineAction = U.BaseVertexAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-split-line',
-      tooltip: L._('Split line'),
-    },
-  },
-
-  onClick: function () {
-    this.vertex.split()
-  },
-})
-
-U.ContinueLineAction = U.BaseVertexAction.extend({
-  options: {
-    toolbarIcon: {
-      className: 'umap-continue-line',
-      tooltip: L._('Continue line'),
-    },
-  },
-
-  onClick: function () {
-    this.vertex.continue()
-  },
-})
-
-// Leaflet.Toolbar doesn't allow twice same toolbar class…
-U.SettingsToolbar = L.Toolbar.Control.extend({})
-U.DrawToolbar = L.Toolbar.Control.extend({
-  initialize: function (options) {
-    L.Toolbar.Control.prototype.initialize.call(this, options)
-    this.map = this.options.map
-    this.map.on('seteditedfeature', this.redraw, this)
-  },
-
-  appendToContainer: function (container) {
-    this.options.actions = []
-    if (this.map._umap.properties.enableMarkerDraw) {
-      this.options.actions.push(U.DrawMarkerAction)
-    }
-    if (this.map._umap.properties.enablePolylineDraw) {
-      this.options.actions.push(U.DrawPolylineAction)
-      if (
-        this.map._umap.editedFeature &&
-        this.map._umap.editedFeature instanceof U.LineString
-      ) {
-        this.options.actions.push(U.AddPolylineShapeAction)
-      }
-    }
-    if (this.map._umap.properties.enablePolygonDraw) {
-      this.options.actions.push(U.DrawPolygonAction)
-      if (
-        this.map._umap.editedFeature &&
-        this.map._umap.editedFeature instanceof U.Polygon
-      ) {
-        this.options.actions.push(U.AddPolygonShapeAction)
-      }
-    }
-    L.Toolbar.Control.prototype.appendToContainer.call(this, container)
-  },
-
-  redraw: function () {
-    const container = this._control.getContainer()
-    container.innerHTML = ''
-    this.appendToContainer(container)
-  },
-})
-
 U.EditControl = L.Control.extend({
   options: {
     position: 'topright',
@@ -491,18 +152,6 @@ U.CaptionControl = L.Control.Button.extend({
   },
 })
 
-U.StarControl = L.Control.Button.extend({
-  options: {
-    position: 'topleft',
-    title: L._('Star this map'),
-    className: 'leaflet-control-star map-star umap-control',
-  },
-
-  onClick: function () {
-    this._umap.star()
-  },
-})
-
 L.Control.Embed = L.Control.Button.extend({
   options: {
     position: 'topleft',
@@ -600,12 +249,12 @@ U.TileLayerChooser = L.Control.extend({
   },
 
   openSwitcher: function (options = {}) {
-    const container = L.DomUtil.create('div', 'umap-tilelayer-switcher-container')
+    const container = L.DomUtil.create('div', 'umap-edit-tilelayers')
     L.DomUtil.createTitle(container, L._('Change tilelayers'), 'icon-tilelayer')
     this._tilelayers_container = L.DomUtil.create('ul', '', container)
     this.buildList(options)
     const panel = options.edit ? this.map._umap.editPanel : this.map._umap.panel
-    panel.open({ content: container })
+    panel.open({ content: container, highlight: 'tilelayers' })
   },
 
   buildList: function (options) {
@@ -1041,15 +690,24 @@ U.Editable = L.Editable.extend({
   onEscape: function () {
     this.once('editable:drawing:end', (event) => {
       this._umap.tooltip.close()
+      // When hitting Escape before adding a marker,
+      // it tries to edit an unconnected marker.
+      if (event?.layer?.feature?.datalayer === null) return
       // Leaflet.Editable will delete the drawn shape if invalid
       // (eg. line has only one drawn point)
       // So let's check if the layer has no more shape
       if (!event.layer.feature.hasGeom()) {
         event.layer.feature.del()
       } else {
+        event.layer.feature.onCommit()
         event.layer.feature.edit()
       }
     })
     this.stopDrawing()
   },
+
+  createVertexIcon: (options) =>
+    L.Browser.mobile && L.Browser.touch
+      ? L.divIcon({ iconSize: new L.Point(20, 20), ...options })
+      : L.divIcon({ iconSize: new L.Point(12, 12), ...options }),
 })

umap/static/umap/locale/am_ET.js

@@ -19,7 +19,6 @@ const locale = {
     "Add a new property": "አዲስ ባህርይ ጨምር",
     "Add a polygon to the current multi": "ላሁኑ ብዝሀ ፖሊጎን ጨምር",
     "Add image URL": "Add image URL",
-    "Add": "Add",
     "Advanced actions": "ተጨማሪ ተግባራት",
     "Advanced properties": "ተጨማሪ ባህርያት",
     "All data and settings of the map": "All data and settings of the map",
@@ -120,7 +119,6 @@ const locale = {
     "Display the locate control": "Display the locate control",
     "Display the measure control": "Display the measure control",
     "Display the search control": "Display the search control",
-    "Display the star map button": "Display the star map button",
     "Display the tile layers control": "Display the tile layers control",
     "Display the zoom control": "Display the zoom control",
     "Do you want to display a caption bar?": "የካፕሽን ባሩን ማሳየት ትፈልጋለህ?",
@@ -301,7 +299,6 @@ const locale = {
     "Restore this version": "ይህንን እትም መልስ",
     "Save current edits": "የአሁኑን እርማቶች አስቀምጥ/አድን",
     "Save map": "Save map",
-    "Save this center and zoom": "ይህንን ዙም እና መሀከል አስቀምጥ/አድን",
     "Save this location as new feature": "Save this location as new feature",
     "Save": "አድን/አስቀምጥ",
     "Saved center and zoom": "Saved center and zoom",
@@ -516,11 +513,26 @@ const locale = {
     "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous",
+    "created at {date}": "created at {date}",
+    "modified at {date}": "modified at {date}",
+    "Default zoom": "Default zoom",
+    "Default latitude": "Default latitude",
+    "Default longitude": "Default longitude",
+    "Edit map default view": "Edit map default view",
+    "Use current center and zoom": "Use current center and zoom"
 }
 L.registerLocale("am_ET", locale)
 L.setLocale("am_ET")