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

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

@@ -104,6 +104,7 @@ export const Cluster = FeatureGroup.extend({
   initialize: function (datalayer) {
     this.datalayer = datalayer
     this._bucket = []
+    this._group = new LayerGroup()
     if (!Utils.isObject(this.datalayer.properties.cluster)) {
       this.datalayer.properties.cluster = {}
     }
@@ -117,11 +118,11 @@ export const Cluster = FeatureGroup.extend({
 
   removeClusters() {
     this.hideCoverage()
+    for (const layer of this._bucket) {
+      delete layer._cluster
+    }
     if (this._map) {
-      for (const cluster of this._clusters) {
-        const layer = cluster._layers.length === 1 ? cluster._layers[0] : cluster
-        this._map.removeLayer(layer)
-      }
+      this._group.clearLayers()
     }
   },
 
@@ -129,7 +130,7 @@ export const Cluster = FeatureGroup.extend({
     if (this._map) {
       for (const cluster of this._clusters) {
         const layer = cluster._layers.length === 1 ? cluster._layers[0] : cluster
-        this._map.addLayer(layer)
+        this._group.addLayer(layer)
       }
     }
   },
@@ -144,8 +145,11 @@ export const Cluster = FeatureGroup.extend({
     const radius = this.datalayer.properties.cluster?.radius || 80
     this._clusters = []
     const map = this.datalayer._umap._leafletMap
+    this._bounds = map.getBounds().pad(0.1)
     const CRS = map.options.crs
     for (const layer of this._bucket) {
+      if (layer._cluster) continue
+      if (!this._bounds.contains(layer._latlng)) continue
       layer._xy = CRS.latLngToPoint(layer._latlng, map.getZoom())
       let cluster = null
       for (const candidate of this._clusters) {
@@ -188,21 +192,34 @@ export const Cluster = FeatureGroup.extend({
     this.on('mouseout', this.onMouseOut)
     this.compute()
     LayerMixin.onAdd.call(this, leafletMap)
-    leafletMap.on('zoomend', this.redraw, this)
+    leafletMap.on('moveend', this.onMoveEnd, this)
+    leafletMap.on('zoomend', this.onZoomEnd, this)
     this.addClusters()
+    leafletMap.addLayer(this._group)
     return FeatureGroup.prototype.onAdd.call(this, leafletMap)
   },
 
   onRemove: function (leafletMap) {
-    leafletMap.off('zoomend', this.redraw, this)
+    leafletMap.off('zoomend', this.onZoomEnd, this)
+    leafletMap.off('moveend', this.onMoveEnd, this)
     this.off('click', this.onClick)
     this.off('mouseover', this.onMouseOver)
     this.off('mouseout', this.onMouseOut)
     LayerMixin.onRemove.call(this, leafletMap)
     this.removeClusters()
+    leafletMap.removeLayer(this._group)
     return FeatureGroup.prototype.onRemove.call(this, leafletMap)
   },
 
+  onZoomEnd: function () {
+    this.removeClusters()
+  },
+
+  onMoveEnd: function () {
+    this.compute()
+    this.addClusters()
+  },
+
   showCoverage(cluster) {
     if (cluster._coverage) {
       this._shownCoverage = cluster._coverage
@@ -235,7 +252,10 @@ export const Cluster = FeatureGroup.extend({
     [
       'properties.cluster.radius',
       {
-        handler: 'BlurIntInput',
+        handler: 'Range',
+        min: 40,
+        max: 200,
+        step: 10,
         placeholder: translate('Clustering radius'),
         helpText: translate('Override clustering radius (default 80)'),
       },

umap/static/umap/js/modules/rendering/ui.js

@@ -114,6 +114,10 @@ const PointMixin = {
     FeatureMixin.addInteractions.call(this)
     this.on('dragend', (event) => {
       this.feature.edit(event)
+      if (this._cluster) {
+        delete this._originalLatLng
+        this.feature.datalayer.dataChanged()
+      }
     })
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)
@@ -127,7 +131,6 @@ const PointMixin = {
   },
 
   _enableDragging: function () {
-    if (this._cluster) return
     // TODO: start dragging after 1 second on mouse down
     if (this._map._umap.editEnabled) {
       if (!this.editEnabled()) this.enableEdit()

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

@@ -1609,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

umap/static/umap/locale/da.js

@@ -578,44 +578,44 @@ const locale = {
     "Rename this field": "Omdøb dette felt",
     "Delete this field": "Slet dette felt",
     "Double click to edit the name": "Dobbeltklik for at redigere navnet",
-    "Print map": "Print map",
-    "Choose a format": "Choose a format",
-    "Scale map": "Scale map",
-    "portrait": "portrait",
-    "landscape": "landscape",
-    "Print": "Print",
-    "Preparing the print…": "Preparing the print…",
-    "Large Circle": "Large Circle",
-    "Icon size": "Icon size",
-    "Will only affect raw and large circle icons.": "Will only affect raw and large circle icons.",
-    "Route": "Route",
-    "Display the print control": "Display the print control",
-    "Compute isochrone from here": "Compute isochrone from here",
-    "Route settings": "Route settings",
-    "Transform to regular line": "Transform to regular line",
-    "Transform to route": "Transform to route",
-    "Restore route": "Restore route",
-    "Compute elevation": "Compute elevation",
-    "Profile": "Profile",
-    "Compute elevations": "Compute elevations",
-    "Route preference": "Route preference",
-    "Compute route": "Compute route",
-    "Walking": "Walking",
-    "Hiking": "Hiking",
-    "By car": "By car",
-    "Cycling": "Cycling",
-    "Wheelchair": "Wheelchair",
-    "Recommended": "Recommended",
-    "Fastest": "Fastest",
-    "Shortest": "Shortest",
-    "Max time (in minutes)": "Max time (in minutes)",
-    "Number of lines": "Number of lines",
-    "Distance:": "Distance:",
-    "Gain:": "Gain:",
-    "Loss:": "Loss:",
-    "Altitude:": "Altitude:",
-    "Right-click to edit": "Right-click to edit",
-    "Draw along routes": "Draw along routes"
+    "Print map": "Udskriv kort",
+    "Choose a format": "Vælg dit format",
+    "Scale map": "Skalér kort",
+    "portrait": "portræt",
+    "landscape": "landskab",
+    "Print": "Udskriv",
+    "Preparing the print…": "Forbereder udskriften…",
+    "Large Circle": "Stor cirkel",
+    "Icon size": "Ikonstørrelse",
+    "Will only affect raw and large circle icons.": "Vil kun påvirke rå og store cirkelikoner.",
+    "Route": "Rute",
+    "Display the print control": "Vis udskriftskontrol",
+    "Compute isochrone from here": "Beregn isokron herfra",
+    "Route settings": "Ruteindstillinger",
+    "Transform to regular line": "Omdan til almindelig linje",
+    "Transform to route": "Omdan til rute",
+    "Restore route": "Gendan rute",
+    "Compute elevation": "Beregn højde",
+    "Profile": "Profil",
+    "Compute elevations": "Beregn højder",
+    "Route preference": "Rutepræference",
+    "Compute route": "Beregn rute",
+    "Walking": "Gåtur",
+    "Hiking": "Vandring",
+    "By car": "I bil",
+    "Cycling": "Cykling",
+    "Wheelchair": "Kørestol",
+    "Recommended": "Anbefalet",
+    "Fastest": "Hurtigst",
+    "Shortest": "Korteste",
+    "Max time (in minutes)": "Maksimal tid (i minutter)",
+    "Number of lines": "Antal linjer",
+    "Distance:": "Afstand:",
+    "Gain:": "Forøgelse:",
+    "Loss:": "Tab:",
+    "Altitude:": "Højde:",
+    "Right-click to edit": "Højreklik for at redigere",
+    "Draw along routes": "Tegn langs ruter"
 }
 L.registerLocale("da", locale)
 L.setLocale("da")

umap/static/umap/locale/da.json

@@ -578,42 +578,42 @@
     "Rename this field": "Omdøb dette felt",
     "Delete this field": "Slet dette felt",
     "Double click to edit the name": "Dobbeltklik for at redigere navnet",
-    "Print map": "Print map",
-    "Choose a format": "Choose a format",
-    "Scale map": "Scale map",
-    "portrait": "portrait",
-    "landscape": "landscape",
-    "Print": "Print",
-    "Preparing the print…": "Preparing the print…",
-    "Large Circle": "Large Circle",
-    "Icon size": "Icon size",
-    "Will only affect raw and large circle icons.": "Will only affect raw and large circle icons.",
-    "Route": "Route",
-    "Display the print control": "Display the print control",
-    "Compute isochrone from here": "Compute isochrone from here",
-    "Route settings": "Route settings",
-    "Transform to regular line": "Transform to regular line",
-    "Transform to route": "Transform to route",
-    "Restore route": "Restore route",
-    "Compute elevation": "Compute elevation",
-    "Profile": "Profile",
-    "Compute elevations": "Compute elevations",
-    "Route preference": "Route preference",
-    "Compute route": "Compute route",
-    "Walking": "Walking",
-    "Hiking": "Hiking",
-    "By car": "By car",
-    "Cycling": "Cycling",
-    "Wheelchair": "Wheelchair",
-    "Recommended": "Recommended",
-    "Fastest": "Fastest",
-    "Shortest": "Shortest",
-    "Max time (in minutes)": "Max time (in minutes)",
-    "Number of lines": "Number of lines",
-    "Distance:": "Distance:",
-    "Gain:": "Gain:",
-    "Loss:": "Loss:",
-    "Altitude:": "Altitude:",
-    "Right-click to edit": "Right-click to edit",
-    "Draw along routes": "Draw along routes"
+    "Print map": "Udskriv kort",
+    "Choose a format": "Vælg dit format",
+    "Scale map": "Skalér kort",
+    "portrait": "portræt",
+    "landscape": "landskab",
+    "Print": "Udskriv",
+    "Preparing the print…": "Forbereder udskriften…",
+    "Large Circle": "Stor cirkel",
+    "Icon size": "Ikonstørrelse",
+    "Will only affect raw and large circle icons.": "Vil kun påvirke rå og store cirkelikoner.",
+    "Route": "Rute",
+    "Display the print control": "Vis udskriftskontrol",
+    "Compute isochrone from here": "Beregn isokron herfra",
+    "Route settings": "Ruteindstillinger",
+    "Transform to regular line": "Omdan til almindelig linje",
+    "Transform to route": "Omdan til rute",
+    "Restore route": "Gendan rute",
+    "Compute elevation": "Beregn højde",
+    "Profile": "Profil",
+    "Compute elevations": "Beregn højder",
+    "Route preference": "Rutepræference",
+    "Compute route": "Beregn rute",
+    "Walking": "Gåtur",
+    "Hiking": "Vandring",
+    "By car": "I bil",
+    "Cycling": "Cykling",
+    "Wheelchair": "Kørestol",
+    "Recommended": "Anbefalet",
+    "Fastest": "Hurtigst",
+    "Shortest": "Korteste",
+    "Max time (in minutes)": "Maksimal tid (i minutter)",
+    "Number of lines": "Antal linjer",
+    "Distance:": "Afstand:",
+    "Gain:": "Forøgelse:",
+    "Loss:": "Tab:",
+    "Altitude:": "Højde:",
+    "Right-click to edit": "Højreklik for at redigere",
+    "Draw along routes": "Tegn langs ruter"
 }

umap/static/umap/locale/el.js

@@ -535,87 +535,87 @@ const locale = {
     "Back to list": "Πίσω στην λίστα",
     "Toggle rule": "Εναλλαγή κανόνα",
     "Delete rule": "Διαγραφή κανόνα",
-    "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.": "Ενεργοποιήστε την ζωντανή συνεργατική επεξεργασία σε αυτόν τον χάρτη. Άλλοι χρήστες θα πρέπει να ξαναφορτώσουν τον χάρτη μετά την αλλαγή αυτής της ρύθμισης.",
-    "More help resources": "More help resources",
-    "This map is a template": "This map is a template",
-    "Add text along path": "Add text along path",
-    "Text color": "Text color",
-    "Text offset": "Text offset",
-    "Text position": "Text position",
-    "start": "start",
-    "center": "center",
-    "end": "end",
-    "Text repeat": "Text repeat",
-    "Text rotate": "Text rotate",
-    "Text size": "Text size",
-    "Load map template": "Load map template",
-    "My templates": "My templates",
-    "From staff": "From staff",
-    "From community": "From community",
-    "You must select a template.": "You must select a template.",
-    "Line decoration": "Line decoration",
-    "Reuse this template": "Reuse this template",
-    "Create a new map using this template": "Create a new map using this template",
-    "Save template": "Save template",
-    "Load template": "Load template",
-    "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.",
-    "No geo column found: must be either `lat(itude)` and `lon(gitude)` or `geom(etry)`.": "No geo column found: must be either `lat(itude)` and `lon(gitude)` or `geom(etry)`.",
-    "Add a new field": "Add a new field",
-    "Are you sure you want to delete this field on all the features?": "Are you sure you want to delete this field on all the features?",
-    "Please enter the new name of this field": "Please enter the new name of this field",
-    "Cannot process MultiPoint": "Cannot process MultiPoint",
-    "Manage Fields": "Manage Fields",
-    "Rename this field": "Rename this field",
-    "Delete this field": "Delete this field",
-    "Double click to edit the name": "Double click to edit the name",
-    "Print map": "Print map",
-    "Choose a format": "Choose a format",
-    "Scale map": "Scale map",
-    "portrait": "portrait",
-    "landscape": "landscape",
-    "Print": "Print",
-    "Preparing the print…": "Preparing the print…",
-    "Large Circle": "Large Circle",
-    "Icon size": "Icon size",
-    "Will only affect raw and large circle icons.": "Will only affect raw and large circle icons.",
-    "Route": "Route",
-    "Display the print control": "Display the print control",
-    "Compute isochrone from here": "Compute isochrone from here",
-    "Route settings": "Route settings",
-    "Transform to regular line": "Transform to regular line",
-    "Transform to route": "Transform to route",
-    "Restore route": "Restore route",
-    "Compute elevation": "Compute elevation",
-    "Profile": "Profile",
-    "Compute elevations": "Compute elevations",
-    "Route preference": "Route preference",
-    "Compute route": "Compute route",
-    "Walking": "Walking",
-    "Hiking": "Hiking",
-    "By car": "By car",
-    "Cycling": "Cycling",
-    "Wheelchair": "Wheelchair",
-    "Recommended": "Recommended",
-    "Fastest": "Fastest",
-    "Shortest": "Shortest",
-    "Max time (in minutes)": "Max time (in minutes)",
-    "Number of lines": "Number of lines",
-    "Distance:": "Distance:",
-    "Gain:": "Gain:",
-    "Loss:": "Loss:",
-    "Altitude:": "Altitude:",
-    "Right-click to edit": "Right-click to edit",
-    "Draw along routes": "Draw along routes"
+    "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.": "Ενεργοποιήστε τη ζωντανή συνεργατική επεξεργασία σε αυτόν τον χάρτη. Άλλοι χρήστες θα πρέπει να ξαναφορτώσουν τον χάρτη μετά την αλλαγή αυτής της ρύθμισης.",
+    "More help resources": "Περισσότερες πηγές βοήθειας",
+    "This map is a template": "Αυτός ο χάρτης είναι ένα πρότυπο",
+    "Add text along path": "Προσθήκη κειμένου κατά μήκος του μονοπατιού",
+    "Text color": "Χρώμα κειμένου",
+    "Text offset": "Μετατόπιση κειμένου",
+    "Text position": "Θέση κειμένου",
+    "start": "αρχή",
+    "center": "κέντρο",
+    "end": "τέλος",
+    "Text repeat": "Επανάληψη κειμένου",
+    "Text rotate": "Περιστροφή κειμένου",
+    "Text size": "Μέγεθος κειμένου",
+    "Load map template": "Φόρτωση προτύπου χάρτη",
+    "My templates": "Τα πρότυπά μου",
+    "From staff": "Από το προσωπικό",
+    "From community": "Από την κοινότητα",
+    "You must select a template.": "Πρέπει να επιλέξετε ένα πρότυπο.",
+    "Line decoration": "Διακόσμηση γραμμής",
+    "Reuse this template": "Επαναχρησιμοποίηση του προτύπου",
+    "Create a new map using this template": "Δημιουργία νέου χάρτη χρησιμοποιώντας αυτό το πρότυπο",
+    "Save template": "Αποθήκευση προτύπου",
+    "Load template": "Φόρτωση προτύπου",
+    "Loading a template will apply predefined styles and settings to your map": "Η φόρτωση ενός προτύπου θα εφαρμόσει προκαθορισμένα στυλ και ρυθμίσεις στο χάρτη σας",
+    "Load template with data": "Φόρτωση προτύπου με δεδομένα",
+    "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.": "Δεν υπάρχει ακόμη προτεινόμενο πρότυπο. Τα προτεινόμενα πρότυπα είναι αυτά που έχουν επισημανθεί με αστερίσκο από τους διαχειριστές του uMap.",
+    "There is no public template yet.": "Δεν υπάρχει ακόμη δημόσιο πρότυπο.",
+    "Explore": "Εξερεύνηση",
+    "Import data from public open data portals": "Εισαγωγή δεδομένων από δημόσιες πύλες ανοικτών δεδομένων",
+    "Choose a portal": "Επιλέξτε μια πύλη",
+    "Limit results to current map view": "Περιορισμός αποτελεσμάτων στην τρέχουσα προβολή χάρτη",
+    "Please choose an instance first.": "Παρακαλώ επιλέξτε πρώτα μια περίπτωση.",
+    "No geo column found: must be either `lat(itude)` and `lon(gitude)` or `geom(etry)`.": "Δεν βρέθηκε στήλη γεωγραφικών συντεταγμένων: πρέπει να είναι είτε `lat(itude)` και `lon(gitude)` είτε `geom(etry)`.",
+    "Add a new field": "Προσθήκη νέου πεδίου",
+    "Are you sure you want to delete this field on all the features?": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το πεδίο από όλα τα χαρακτηριστικά;",
+    "Please enter the new name of this field": "Παρακαλώ εισάγετε το νέο όνομα αυτού του πεδίου.",
+    "Cannot process MultiPoint": "Δεν είναι δυνατή η επεξεργασία MultiPoint.",
+    "Manage Fields": "Διαχείριση πεδίων",
+    "Rename this field": "Μετονομασία πεδίου",
+    "Delete this field": "Διαγραφή πεδίου",
+    "Double click to edit the name": "Διπλό κλικ για επεξεργασία του ονόματος",
+    "Print map": "Εκτύπωση χάρτη",
+    "Choose a format": "Επιλέξτε μορφή",
+    "Scale map": "Κλίμακα χάρτη",
+    "portrait": "κατακόρυφα",
+    "landscape": "οριζόντια",
+    "Print": "Εκτύπωση",
+    "Preparing the print…": "Προετοιμασία της εκτύπωσης…",
+    "Large Circle": "Μεγάλος κύκλος",
+    "Icon size": "Μέγεθος εικονιδίου",
+    "Will only affect raw and large circle icons.": "Θα επηρεάσει μόνο τα ακατέργαστα μεγάλα κυκλικά εικονίδια .",
+    "Route": "Διαδρομή",
+    "Display the print control": "Εμφάνιση του ελέγχου εκτύπωσης",
+    "Compute isochrone from here": "Υπολογισμός ισοχρώματος από εδώ",
+    "Route settings": "Ρυθμίσεις διαδρομής",
+    "Transform to regular line": "Μετατροπή σε κανονική γραμμή",
+    "Transform to route": "Μετατροπή σε διαδρομή",
+    "Restore route": "Επαναφορά διαδρομής",
+    "Compute elevation": "Υπολογισμός υψομέτρου",
+    "Profile": "Προφίλ",
+    "Compute elevations": "Υπολογισμός υψομέτρων",
+    "Route preference": "Προτίμηση διαδρομής",
+    "Compute route": "Υπολογισμός διαδρομής",
+    "Walking": "Περπάτημα",
+    "Hiking": "Πεζοπορία",
+    "By car": "Με αυτοκίνητο",
+    "Cycling": "Ποδηλασία",
+    "Wheelchair": "Αναπηρικό αμαξίδιο",
+    "Recommended": "Προτεινόμενη",
+    "Fastest": "Γρηγορότερη",
+    "Shortest": "Συντομότερη",
+    "Max time (in minutes)": "Μέγιστος χρόνος (σε λεπτά)",
+    "Number of lines": "Αριθμός γραμμών",
+    "Distance:": "Απόσταση:",
+    "Gain:": "Κέρδος:",
+    "Loss:": "Απώλεια:",
+    "Altitude:": "Υψόμετρο:",
+    "Right-click to edit": "Δεξί κλικ για επεξεργασία",
+    "Draw along routes": "Σχεδιάστε κατά μήκος διαδρομών"
 }
 L.registerLocale("el", locale)
 L.setLocale("el")