umap-project 3.0.5__py3-none-any.whl → 3.1.0__py3-none-any.whl

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

@@ -4,6 +4,7 @@ import { translate } from '../i18n.js'
 import { WithTemplate } from '../utils.js'
 import * as Utils from '../utils.js'
 import ContextMenu from './contextmenu.js'
+import TemplateImporter from '../templates.js'
 
 const TOP_BAR_TEMPLATE = `
 <div class="umap-main-edit-toolbox with-transition dark">
@@ -37,6 +38,7 @@ const TOP_BAR_TEMPLATE = `
             <i class="icon icon-16 icon-save-disabled"></i>
             <span hidden data-ref="saveLabel">${translate('Save')}</span>
             <span hidden data-ref="saveDraftLabel">${translate('Save draft')}</span>
+            <span hidden data-ref="saveTemplateLabel">${translate('Save template')}</span>
         </button>
     </div>
 </div>`
@@ -167,8 +169,11 @@ export class TopBar extends WithTemplate {
     const syncEnabled = this._umap.getProperty('syncEnabled')
     this.elements.peers.hidden = !syncEnabled
     this.elements.view.disabled = this._umap.sync._undoManager.isDirty()
-    this.elements.saveLabel.hidden = this._umap.permissions.isDraft()
-    this.elements.saveDraftLabel.hidden = !this._umap.permissions.isDraft()
+    const isDraft = this._umap.permissions.isDraft()
+    const isTemplate = this._umap.getProperty('is_template')
+    this.elements.saveLabel.hidden = isDraft || isTemplate
+    this.elements.saveDraftLabel.hidden = !isDraft || isTemplate
+    this.elements.saveTemplateLabel.hidden = !isTemplate
     this._umap.sync._undoManager.toggleState()
   }
 }
@@ -228,7 +233,7 @@ export class BottomBar extends WithTemplate {
 
   buildDataLayerSwitcher() {
     this.elements.layers.innerHTML = ''
-    const datalayers = this._umap.datalayers.filter((d) => d.options.inCaption)
+    const datalayers = this._umap.datalayers.filter((d) => d.properties.inCaption)
     if (datalayers.length < 2) {
       this.elements.layers.hidden = true
     } else {
@@ -261,6 +266,7 @@ const EDIT_BAR_TEMPLATE = `
     <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>
+    <li data-ref="templates" hidden><button type="button" title="${translate('Load template')}" data-getstarted><i class="icon icon-24 icon-template"></i></button></li>
     <li data-ref="layers" hidden><button type="button" title="${translate('Manage layers')}"><i class="icon icon-24 icon-layers"></i></button></li>
     <li data-ref="tilelayers" hidden><button type="button" title="${translate('Change tilelayers')}"><i class="icon icon-24 icon-tilelayer"></i></button></li>
     <li data-ref="center" hidden><button type="button"><i class="icon icon-24 icon-center"></i></button></li>
@@ -272,6 +278,7 @@ const EDIT_BAR_TEMPLATE = `
 export class EditBar extends WithTemplate {
   constructor(umap, leafletMap, parent) {
     super()
+    this.templateIimporter = new TemplateImporter(umap)
     this._umap = umap
     this._leafletMap = leafletMap
     this.loadTemplate(EDIT_BAR_TEMPLATE)
@@ -288,6 +295,7 @@ export class EditBar extends WithTemplate {
     this._onClick('multipolygon', () => this._umap.editedFeature.ui.editor.newShape())
     this._onClick('caption', () => this._umap.editCaption())
     this._onClick('import', () => this._umap.importer.open())
+    this._onClick('templates', () => this.templateIimporter.open())
     this._onClick('layers', () => this._umap.editDatalayers())
     this._onClick('tilelayers', () => this._leafletMap.editTileLayers())
     this._onClick('center', () => this._umap.editCenter())
@@ -306,6 +314,8 @@ export class EditBar extends WithTemplate {
     this.elements.multipolygon.hidden = !(editedFeature instanceof Polygon)
     this.elements.caption.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.import.hidden = this._umap.properties.editMode !== 'advanced'
+    this.elements.templates.hidden =
+      this._umap.properties.editMode !== 'advanced' && !this._umap.datalayers.count()
     this.elements.layers.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.tilelayers.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.center.hidden = this._umap.properties.editMode !== 'advanced'

umap/static/umap/js/modules/ui/panel.js

@@ -57,7 +57,7 @@ export class Panel {
     if (className) DomUtil.addClass(body, className)
     const promise = new Promise((resolve, reject) => {
       DomUtil.addClass(this.container, 'on')
-      resolve()
+      resolve(this)
     })
     DomEvent.on(closeButton, 'click', this.close, this)
     DomEvent.on(resizeButton, 'click', this.resize, this)

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

@@ -137,7 +137,7 @@ export default class Umap {
     this.caption = new Caption(this, this._leafletMap)
     this.importer = new Importer(this)
     this.share = new Share(this)
-    this.rules = new Rules(this)
+    this.rules = new Rules(this, this)
 
     if (this.hasEditMode()) {
       this.editPanel = new EditPanel(this, this._leafletMap)
@@ -205,6 +205,7 @@ export default class Umap {
       }
       this._defaultExtent = true
       this.properties.name = translate('Untitled map')
+      await this.loadTemplateFromQueryString()
       await this.loadDataFromQueryString()
     }
 
@@ -349,6 +350,16 @@ export default class Umap {
     }
   }
 
+  async loadTemplateFromQueryString() {
+    const templateUrl = this.searchParams.get('templateUrl')
+    if (templateUrl) {
+      this.importer.build()
+      this.importer.url = templateUrl
+      this.importer.format = 'umap'
+      this.importer.submit()
+    }
+  }
+
   async loadDataFromQueryString() {
     let data = this.searchParams.get('data')
     const dataUrls = this.searchParams.getAll('dataUrl')
@@ -493,8 +504,7 @@ export default class Umap {
   }
 
   getOption(key, feature) {
-    // TODO: remove when umap.forms.js is refactored and does not call blindly
-    // obj.getOption anymore
+    // TODO: remove when field.js does not call blindly obj.getOption anymore
     return this.getProperty(key, feature)
   }
 
@@ -627,20 +637,20 @@ export default class Umap {
     this.fire('dataloaded')
   }
 
-  createDataLayer(options = {}, sync = true) {
-    options.name =
-      options.name || `${translate('Layer')} ${this.datalayers.count() + 1}`
-    const datalayer = new DataLayer(this, this._leafletMap, options)
+  createDataLayer(properties = {}, sync = true) {
+    properties.name =
+      properties.name || `${translate('Layer')} ${this.datalayers.count() + 1}`
+    const datalayer = new DataLayer(this, this._leafletMap, properties)
 
     if (sync !== false) {
-      datalayer.sync.upsert(datalayer.options)
+      datalayer.sync.upsert(datalayer.properties)
     }
     return datalayer
   }
 
-  createDirtyDataLayer(options) {
-    const datalayer = this.createDataLayer(options, true)
-    return datalayer
+  // TODO: remove me in favor of createDataLayer
+  createDirtyDataLayer(properties) {
+    return this.createDataLayer(properties, true)
   }
 
   newDataLayer() {
@@ -747,7 +757,11 @@ export default class Umap {
     if (!this.editEnabled) return
     if (this.properties.editMode !== 'advanced') return
     const container = DomUtil.create('div')
-    const metadataFields = ['properties.name', 'properties.description']
+    const metadataFields = [
+      'properties.name',
+      'properties.description',
+      'properties.is_template',
+    ]
 
     DomUtil.createTitle(container, translate('Edit map details'), 'icon-caption')
     const builder = new MutatingForm(this, metadataFields, {
@@ -1176,6 +1190,7 @@ export default class Umap {
     }
     const formData = new FormData()
     formData.append('name', this.properties.name)
+    formData.append('is_template', Boolean(this.properties.is_template))
     formData.append('center', JSON.stringify(this.geometry()))
     formData.append('tags', this.properties.tags || [])
     formData.append('settings', JSON.stringify(geojson))
@@ -1480,7 +1495,7 @@ export default class Umap {
       datalayer.renderToolbox(row)
       const builder = new MutatingForm(
         datalayer,
-        [['options.name', { handler: 'EditableText' }]],
+        [['properties.name', { handler: 'EditableText' }]],
         { className: 'umap-form-inline' }
       )
       const form = builder.build()

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

@@ -96,7 +96,7 @@ U.Locate = L.Control.Locate.extend({
 })
 
 U.Search = L.PhotonSearch.extend({
-  initialize: function (map, input, options) {
+  initialize: function (map, input, layer, options) {
     this.options.placeholder = L._('Type a place name or coordinates')
     this.options.location_bias_scale = 0.5
     L.PhotonSearch.prototype.initialize.call(this, map, input, options)
@@ -107,6 +107,7 @@ U.Search = L.PhotonSearch.extend({
         this.handleResultsWithReverse(geojson)
       },
     })
+    this.layer = layer
   },
 
   handleResultsWithReverse: function (geojson) {
@@ -123,6 +124,7 @@ U.Search = L.PhotonSearch.extend({
   },
 
   search: function () {
+    this.layer.clearLayers()
     const pattern = /^(?<lat>[-+]?\d{1,2}[.,]\d+)\s*[ ,]\s*(?<lng>[-+]?\d{1,3}[.,]\d+)$/
     if (pattern.test(this.input.value)) {
       this.hide()
@@ -188,10 +190,10 @@ U.Search = L.PhotonSearch.extend({
     const coords = feature.geometry.coordinates
     const target = L.marker([coords[1], coords[0]], { icon })
     el.addEventListener('mouseover', (event) => {
-      target.addTo(this.map)
+      target.addTo(this.layer)
     })
     el.addEventListener('mouseout', (event) => {
-      target.removeFrom(this.map)
+      target.removeFrom(this.layer)
     })
   },
 
@@ -227,9 +229,14 @@ U.SearchControl = L.Control.extend({
       },
       this
     )
+    this.layer = L.layerGroup().addTo(map)
     return container
   },
 
+  onRemove: function () {
+    this.layer.remove()
+  },
+
   open: function () {
     const options = {
       limit: 10,
@@ -241,7 +248,7 @@ U.SearchControl = L.Control.extend({
     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, options)
+    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 })

umap/static/umap/locale/br.js

@@ -404,7 +404,7 @@ const locale = {
     "Max": "Brasañ",
     "From": "Adalek",
     "Until": "Betek",
-    "Example: key1,key2|Label 2,key3|Label 3|checkbox": "Example: key1,key2|Label 2,key3|Label 3|checkbox",
+    "Example: key1,key2|Label 2,key3|Label 3|checkbox": "Skouer: key1,key2|Label 2,key3|Label 3|checkbox",
     "Edit in OpenStreetMap": "Kemmañ e-barzh OpenStreetMap",
     "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
     "Back to layers": "Distreiñ d'ar gwiskadoù",
@@ -513,7 +513,7 @@ const locale = {
     "Successfully imported {count} feature(s)": "{count} elfenn bet enporzhiet gant berzh",
     "Disconnected": "Digennasket",
     "You must be logged in": "Ret eo deoc'h bezañ kennasket",
-    "on hover": "on hover",
+    "on hover": "pa dremen al logodenn war-c'hore",
     "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": "Enporzhiadur c'hwitet: roadennoù direizh",
@@ -523,27 +523,60 @@ const locale = {
     "Default zoom": "Zoum dre ziouer",
     "Default latitude": "Ledred dre ziouer",
     "Default longitude": "Hedred dre ziouer",
-    "Edit map default view": "Edit map default view",
-    "Use current center and zoom": "Use current center and zoom",
-    "Layer permalink": "Layer permalink",
-    "Back to home": "Back to home",
-    "Home logo": "Home logo",
-    "Add this geometry to my map": "Add this geometry to my map",
-    "Add this place to my map": "Add this place to my map",
-    "Cancel last edit": "Cancel last edit",
-    "Redo last edit": "Redo last edit",
-    "Links": "Links",
-    "Images": "Images",
+    "Edit map default view": "Kemmañ gwel dre ziouer ar gartenn",
+    "Use current center and zoom": "Implij ar c'hreiz hag ar zoum a-vremañ",
+    "Layer permalink": "Liamm padus ar gwiskad",
+    "Back to home": "Distreiñ d'an degemer",
+    "Home logo": "Logo an degemer",
+    "Add this geometry to my map": "Ouzhpennañ ar c'heometriezh-mañ d'am c'hartenn",
+    "Add this place to my map": "Ouzhpennañ al lec'h-mañ d'am c'hartenn",
+    "Cancel last edit": "Nullañ ar c'hemm diwezhañ",
+    "Redo last edit": "Adober ar c'hemm diwezhañ",
+    "Links": "Liammoù",
+    "Images": "Skeudennoù",
     "Iframes": "Iframes",
-    "Tags": "Tags",
+    "Tags": "Tikedennoù",
     "Geocode": "Geocode",
-    "Display the back to home icon": "Display the back to home icon",
+    "Display the back to home icon": "Diskouez ar bouton \"distreiñ d'an degemer\"",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
     "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
+    "Back to list": "Distreiñ d'al listenn",
     "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
+    "Delete rule": "Dilemel ar reolenn",
+    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes.",
+    "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.": "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.",
+    "More help resources": "Titouroù skoazell all",
+    "This map is a template": "Ur patrom eo ar gartenn-mañ",
+    "Add text along path": "Ouzhpennañ an destenn a-hed al linenn",
+    "Text color": "Liv an destenn",
+    "Text offset": "Dilec'h an destenn",
+    "Text position": "Lec'hiadur an destenn",
+    "start": "deroù",
+    "center": "kreiz",
+    "end": "dibenn",
+    "Text repeat": "Adskrivañ an destenn",
+    "Text rotate": "C'hwelañ an destenn",
+    "Text size": "Ment an destenn",
+    "Load map template": "Kargañ patrom ar gartenn",
+    "My templates": "Ma fatromoù",
+    "From staff": "Erbedet",
+    "From community": "Eus ar gumuniezh",
+    "You must select a template.": "Dav eo deoc'h diuzañ ur patrom.",
+    "Line decoration": "Line decoration",
+    "Reuse this template": "Adimplij ar patrom-mañ",
+    "Create a new map using this template": "Krouiñ ur gartenn nevez en ur implij ar patrom-mañ",
+    "Save template": "Enrollañ ar patrom",
+    "Load template": "Kargañ ar patrom",
+    "Loading a template will apply predefined styles and settings to your map": "Loading a template will apply predefined styles and settings to your map",
+    "Load template with data": "Load template with data",
+    "You have no registered template yet. You can add one by creating a new map and flagging it as \"template\".": "You have no registered template yet. You can add one by creating a new map and flagging it as \"template\".",
+    "There is no recommended template yet. Recommended templates are the ones starred by uMap administrators.": "There is no recommended template yet. Recommended templates are the ones starred by uMap administrators.",
+    "There is no public template yet.": "There is no public template yet.",
+    "Explore": "Explore",
+    "Import data from public open data portals": "Import data from public open data portals",
+    "Choose a portal": "Choose a portal",
+    "Limit results to current map view": "Limit results to current map view",
+    "Please choose an instance first.": "Please choose an instance first."
 }
 L.registerLocale("br", locale)
 L.setLocale("br")

umap/static/umap/locale/br.json

@@ -404,7 +404,7 @@
     "Max": "Brasañ",
     "From": "Adalek",
     "Until": "Betek",
-    "Example: key1,key2|Label 2,key3|Label 3|checkbox": "Example: key1,key2|Label 2,key3|Label 3|checkbox",
+    "Example: key1,key2|Label 2,key3|Label 3|checkbox": "Skouer: key1,key2|Label 2,key3|Label 3|checkbox",
     "Edit in OpenStreetMap": "Kemmañ e-barzh OpenStreetMap",
     "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
     "Back to layers": "Distreiñ d'ar gwiskadoù",
@@ -513,7 +513,7 @@
     "Successfully imported {count} feature(s)": "{count} elfenn bet enporzhiet gant berzh",
     "Disconnected": "Digennasket",
     "You must be logged in": "Ret eo deoc'h bezañ kennasket",
-    "on hover": "on hover",
+    "on hover": "pa dremen al logodenn war-c'hore",
     "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": "Enporzhiadur c'hwitet: roadennoù direizh",
@@ -523,25 +523,58 @@
     "Default zoom": "Zoum dre ziouer",
     "Default latitude": "Ledred dre ziouer",
     "Default longitude": "Hedred dre ziouer",
-    "Edit map default view": "Edit map default view",
-    "Use current center and zoom": "Use current center and zoom",
-    "Layer permalink": "Layer permalink",
-    "Back to home": "Back to home",
-    "Home logo": "Home logo",
-    "Add this geometry to my map": "Add this geometry to my map",
-    "Add this place to my map": "Add this place to my map",
-    "Cancel last edit": "Cancel last edit",
-    "Redo last edit": "Redo last edit",
-    "Links": "Links",
-    "Images": "Images",
+    "Edit map default view": "Kemmañ gwel dre ziouer ar gartenn",
+    "Use current center and zoom": "Implij ar c'hreiz hag ar zoum a-vremañ",
+    "Layer permalink": "Liamm padus ar gwiskad",
+    "Back to home": "Distreiñ d'an degemer",
+    "Home logo": "Logo an degemer",
+    "Add this geometry to my map": "Ouzhpennañ ar c'heometriezh-mañ d'am c'hartenn",
+    "Add this place to my map": "Ouzhpennañ al lec'h-mañ d'am c'hartenn",
+    "Cancel last edit": "Nullañ ar c'hemm diwezhañ",
+    "Redo last edit": "Adober ar c'hemm diwezhañ",
+    "Links": "Liammoù",
+    "Images": "Skeudennoù",
     "Iframes": "Iframes",
-    "Tags": "Tags",
+    "Tags": "Tikedennoù",
     "Geocode": "Geocode",
-    "Display the back to home icon": "Display the back to home icon",
+    "Display the back to home icon": "Diskouez ar bouton \"distreiñ d'an degemer\"",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
     "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
+    "Back to list": "Distreiñ d'al listenn",
     "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
+    "Delete rule": "Dilemel ar reolenn",
+    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes.",
+    "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.": "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.",
+    "More help resources": "Titouroù skoazell all",
+    "This map is a template": "Ur patrom eo ar gartenn-mañ",
+    "Add text along path": "Ouzhpennañ an destenn a-hed al linenn",
+    "Text color": "Liv an destenn",
+    "Text offset": "Dilec'h an destenn",
+    "Text position": "Lec'hiadur an destenn",
+    "start": "deroù",
+    "center": "kreiz",
+    "end": "dibenn",
+    "Text repeat": "Adskrivañ an destenn",
+    "Text rotate": "C'hwelañ an destenn",
+    "Text size": "Ment an destenn",
+    "Load map template": "Kargañ patrom ar gartenn",
+    "My templates": "Ma fatromoù",
+    "From staff": "Erbedet",
+    "From community": "Eus ar gumuniezh",
+    "You must select a template.": "Dav eo deoc'h diuzañ ur patrom.",
+    "Line decoration": "Line decoration",
+    "Reuse this template": "Adimplij ar patrom-mañ",
+    "Create a new map using this template": "Krouiñ ur gartenn nevez en ur implij ar patrom-mañ",
+    "Save template": "Enrollañ ar patrom",
+    "Load template": "Kargañ ar patrom",
+    "Loading a template will apply predefined styles and settings to your map": "Loading a template will apply predefined styles and settings to your map",
+    "Load template with data": "Load template with data",
+    "You have no registered template yet. You can add one by creating a new map and flagging it as \"template\".": "You have no registered template yet. You can add one by creating a new map and flagging it as \"template\".",
+    "There is no recommended template yet. Recommended templates are the ones starred by uMap administrators.": "There is no recommended template yet. Recommended templates are the ones starred by uMap administrators.",
+    "There is no public template yet.": "There is no public template yet.",
+    "Explore": "Explore",
+    "Import data from public open data portals": "Import data from public open data portals",
+    "Choose a portal": "Choose a portal",
+    "Limit results to current map view": "Limit results to current map view",
+    "Please choose an instance first.": "Please choose an instance first."
 }