umap-project 3.3.3__tar.gz → 3.3.5__tar.gz

{umap_project-3.3.3 → umap_project-3.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.3.3
+Version: 3.3.5
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

umap_project-3.3.5/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "3.3.5"

{umap_project-3.3.3 → umap_project-3.3.5}/umap/locale/de/LC_MESSAGES/django.po

@@ -15,14 +15,15 @@
 # Paul Vogel, 2025
 # pgeo, 2023
 # Klumbumbus, 2013-2014,2018-2019
+# s r, 2025
 # YOHAN BONIFACE <yb@enix.org>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-10 09:19+0000\n"
+"POT-Creation-Date: 2025-08-14 15:22+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Paul Vogel, 2025\n"
+"Last-Translator: s r, 2025\n"
 "Language-Team: German (http://app.transifex.com/openstreetmap/umap/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -212,11 +213,11 @@ msgstr "Fahrradfahren"
 
 #: settings/base.py:320
 msgid "Business"
-msgstr ""
+msgstr "Gewerblich"
 
 #: settings/base.py:321
 msgid "Environment"
-msgstr "Umgebung"
+msgstr "Umwelt"
 
 #: settings/base.py:322
 msgid "Education"
@@ -224,11 +225,11 @@ msgstr "Bildung"
 
 #: settings/base.py:323
 msgid "Food and Agriculture"
-msgstr ""
+msgstr "Nahrungsmittel und Landwirtschaft"
 
 #: settings/base.py:324
 msgid "Geopolitics"
-msgstr ""
+msgstr "Geopolitik"
 
 #: settings/base.py:325
 msgid "Health"
@@ -244,7 +245,7 @@ msgstr "Geschichte"
 
 #: settings/base.py:328
 msgid "Public sector"
-msgstr ""
+msgstr "Öffentlicher Sektor"
 
 #: settings/base.py:329
 msgid "Science"
@@ -252,7 +253,7 @@ msgstr "Wissenschaft"
 
 #: settings/base.py:330
 msgid "Shopping"
-msgstr "Shopping"
+msgstr "Einkaufsmöglichkeiten"
 
 #: settings/base.py:331
 msgid "Sport and Leisure"
@@ -264,7 +265,7 @@ msgstr "Reisen"
 
 #: settings/base.py:333
 msgid "Transports"
-msgstr ""
+msgstr "Transport"
 
 #: settings/base.py:334
 msgid "Tourism"
@@ -337,7 +338,7 @@ msgstr "Schaue dir %(current_user)s's favorisierten Karten an"
 msgid "%(current_user)s has no starred maps yet."
 msgstr "%(current_user)s hat keine favorisierten Karten."
 
-#: templates/base.html:13
+#: templates/base.html:16
 msgid ""
 "uMap lets you create maps with OpenStreetMap layers in a minute and embed "
 "them in your site."
@@ -349,11 +350,11 @@ msgstr "Anmeldung"
 
 #: templates/registration/login.html:22
 msgid "To save and easily find your maps, identify yourself."
-msgstr "Um deine Karten einfach zu speichern und wieder zu finden, merke dich an."
+msgstr "Melde dich an um deine Karten einfach zu speichern und wieder zu finden."
 
 #: templates/registration/login.html:25
 msgid "Please log in with your account:"
-msgstr "Bitte melden Sie sich mit Ihrem Konto an"
+msgstr "Bitte melde dich mit deinem Konto an"
 
 #: templates/registration/login.html:42
 msgid "Username"
@@ -513,11 +514,11 @@ msgstr "Meine Karten"
 #: templates/umap/dashboard_menu.html:11
 #, python-format
 msgid "My Templates (%(count)s)"
-msgstr ""
+msgstr "Meine Vorlagen (%(count)s)"
 
 #: templates/umap/dashboard_menu.html:13 templates/umap/user_templates.html:6
 msgid "My Templates"
-msgstr ""
+msgstr "Meine Vorlagen"
 
 #: templates/umap/dashboard_menu.html:17
 msgid "My profile"
@@ -543,7 +544,7 @@ msgstr "Du bist eingeloggt. Weiterleitung..."
 msgid "template"
 msgstr "Vorlage"
 
-#: templates/umap/map_list.html:18 views.py:458
+#: templates/umap/map_list.html:18 views.py:459
 msgid "by"
 msgstr "von"
 
@@ -720,7 +721,7 @@ msgstr "Keine Karte gefunden."
 
 #: templates/umap/search.html:36
 msgid "Latest created maps in category"
-msgstr ""
+msgstr "Zuletzt erstelle Karten in Kategorie"
 
 #: templates/umap/search.html:43
 msgid "Latest created maps"
@@ -775,7 +776,7 @@ msgstr "Meine Karten suchen"
 
 #: templates/umap/user_dashboard.html:11
 msgid "Map’s name"
-msgstr ""
+msgstr "Kartenname"
 
 #: templates/umap/user_dashboard.html:12
 #, python-format
@@ -800,93 +801,97 @@ msgstr "Neues Team"
 
 #: templates/umap/user_templates.html:10
 msgid "Search my templates"
-msgstr ""
+msgstr "Meine Vorlagen durchsuchen"
 
 #: templates/umap/user_templates.html:11
 msgid "Template’s name"
-msgstr ""
+msgstr "Vorlagenname"
 
 #: templates/umap/user_templates.html:12
 #, python-format
 msgid "Download %(count)s templates"
-msgstr ""
+msgstr "Herunterladen von %(count)s Vorlage(n)"
 
 #: templates/umap/user_templates.html:15
 msgid "You have no template yet."
-msgstr ""
+msgstr "Du hast noch keine Vorlagen"
 
 #: templates/umap/user_templates.html:16
 msgid "Create a template"
-msgstr ""
+msgstr "Erstelle Vorlage"
 
 #: templates/umap/user_templates.html:17
 msgid "No template found."
-msgstr ""
+msgstr "Keine Vorlage gefunden"
 
-#: views.py:233
+#: views.py:235
 msgid "Cannot delete a team with more than one member"
 msgstr "Teams mit mehr als einem Mitglied können nicht gelöscht werden"
 
-#: views.py:237
+#: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
 msgstr "Team “%(name)s” wurde gelöscht"
 
-#: views.py:463
+#: views.py:464
 msgid "View the map"
 msgstr "Diese Karte anzeigen"
 
-#: views.py:864
+#: views.py:867
 msgid "See full screen"
 msgstr "Vollbildanzeige"
 
-#: views.py:1007
+#: views.py:1010
 msgid "Map editors updated with success!"
 msgstr "Bearbeiter erfolgreich geändert"
 
-#: views.py:1043
+#: views.py:1046
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "Der uMap-Bearbeitungslink für Deine Karte: %(map_name)s"
 
-#: views.py:1046
+#: views.py:1049
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Dies ist der geheime Bearbeitungslink: %(link)s"
 
-#: views.py:1053
+#: views.py:1056
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "E-Mail kann nicht gesendet werden an %(email)s"
 
-#: views.py:1056
+#: views.py:1059
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Email gesendet an %(email)s"
 
-#: views.py:1067
+#: views.py:1070
 msgid "Only its owner can delete the map."
 msgstr "Nur der Ersteller kann die Karte löschen."
 
-#: views.py:1073
+#: views.py:1076
 msgid "Map successfully deleted."
 msgstr "Karte erfolgreich gelöscht."
 
-#: views.py:1099
+#: views.py:1102
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr "Deine Karte wurde kopiert! Wenn du diese Karte von einem anderen Computer aus bearbeiten möchtest, benutze bitte diesen Link: %(anonymous_url)s"
 
-#: views.py:1104
+#: views.py:1107
 msgid "Congratulations, your map has been cloned!"
 msgstr "Glückwunsch, deine Karte wurde kopiert!"
 
-#: views.py:1358
+#: views.py:1361
 msgid "Layer successfully deleted."
 msgstr "Ebene erfolgreich gelöscht."
 
-#: views.py:1380
+#: views.py:1383
 msgid "Permissions updated with success!"
 msgstr "Berechtigungen erfolgreich aktualisiert!"
+
+#: views.py:1400
+msgid "Generic"
+msgstr "Allgemein"

{umap_project-3.3.3 → umap_project-3.3.5}/umap/static/umap/js/modules/data/features.js

@@ -241,11 +241,12 @@ class Feature {
 
     const properties = []
     for (const field of this.fields) {
-      let handler = 'Input'
+      const options = { handler: 'Input', label: field.key }
       if (field.key === 'description' || field.type === 'Text') {
-        handler = 'Textarea'
+        options.handler = 'Textarea'
+        options.helpEntries = ['textFormatting']
       }
-      properties.push([`properties.${field.key}`, { label: field.key, handler }])
+      properties.push([`properties.${field.key}`, options])
     }
     builder = new MutatingForm(this, properties, {
       id: 'umap-feature-properties',

{umap_project-3.3.3 → umap_project-3.3.5}/umap/static/umap/js/modules/data/layer.js

@@ -304,10 +304,9 @@ export class DataLayer {
 
   fromGeoJSON(geojson, sync = true) {
     if (!geojson) return []
-    const features = this.addData(geojson, sync)
     this._needsFetch = false
+    const features = this.addData(geojson, sync)
     this.onDataLoaded()
-    this.dataChanged()
     return features
   }
 
@@ -431,14 +430,27 @@ export class DataLayer {
     this.layer.removeLayer(feature.ui)
   }
 
-  addFeature(feature) {
+  addFeature(feature, sync = false) {
     feature.connectToDataLayer(this)
     this.features.add(feature)
     this._umap.featuresIndex[feature.getSlug()] = feature
     // TODO: quid for remote data ?
     this.inferFields(feature)
-    this.showFeature(feature)
+    try {
+      this.showFeature(feature)
+    } catch {
+      if (this._umap.editEnabled) {
+        Alert.error(translate('Skipping invalid geometry'))
+      }
+      console.error('Invalid geometry', feature)
+      this.removeFeature(feature, false)
+      return
+    }
     this.dataChanged()
+    if (sync) {
+      feature.sync.upsert(feature.toGeoJSON(), null)
+    }
+    return feature
   }
 
   removeFeature(feature, sync) {
@@ -450,7 +462,9 @@ export class DataLayer {
       const oldValue = feature.toGeoJSON()
       feature.sync.delete(oldValue)
     }
-    this.hideFeature(feature)
+    try {
+      this.hideFeature(feature)
+    } catch {}
     delete this._umap.featuresIndex[feature.getSlug()]
     feature.disconnectFromDataLayer(this)
     this.features.del(feature)
@@ -601,16 +615,18 @@ export class DataLayer {
 
     switch (geometry.type) {
       case 'Point':
-        // FIXME: deal with MultiPoint
-        feature = new Point(this._umap, this, geojson, id)
-        break
       case 'MultiPoint':
-        if (geometry.coordinates?.length === 1) {
+        if (
+          geometry.coordinates?.length === 1 &&
+          Array.isArray(geometry.coordinates?.[0])
+        ) {
           geojson.geometry.coordinates = geojson.geometry.coordinates[0]
-          feature = new Point(this._umap, this, geojson, id)
-        } else if (this._umap.editEnabled) {
+          geojson.geometry.type = 'Point'
+        } else if (geometry.type === 'MultiPoint' && this._umap.editEnabled) {
           Alert.error(translate('Cannot process MultiPoint'))
+          break
         }
+        feature = new Point(this._umap, this, geojson, id)
         break
       case 'MultiLineString':
       case 'LineString':
@@ -631,9 +647,7 @@ export class DataLayer {
         }
     }
     if (feature && !feature.isEmpty()) {
-      this.addFeature(feature)
-      if (sync) feature.sync.upsert(feature.toGeoJSON(), null)
-      return feature
+      return this.addFeature(feature, sync)
     }
   }
 
@@ -735,7 +749,9 @@ export class DataLayer {
   }
 
   clear(sync = true) {
+    this._batch = true
     this.features.forEach((feature) => feature.del(sync))
+    this._batch = false
     this.dataChanged()
   }
 

{umap_project-3.3.3 → umap_project-3.3.5}/umap/static/umap/js/modules/rendering/layers/base.js

@@ -6,7 +6,7 @@ export const LayerMixin = {
   browsable: true,
 
   onInit: function (leafletMap) {
-    if (this.datalayer.autoLoaded()) leafletMap.on('zoomend', this.onZoomEnd, this)
+    leafletMap.on('zoomend', this.onZoomEnd, this)
   },
 
   onDelete: function (leafletMap) {
@@ -48,7 +48,7 @@ export const LayerMixin = {
 
   onMoveEnd: function () {
     if (this.datalayer.hasDynamicData() && this.datalayer.showAtZoom()) {
-      this.datalayer.fetchRemoteData()
+      this.datalayer.fetchData()
     }
   },
 

{umap_project-3.3.3 → umap_project-3.3.5}/umap/static/umap/js/modules/rendering/layers/cluster.js

@@ -198,16 +198,12 @@ export const Cluster = FeatureGroup.extend({
     this.on('mouseout', this.onMouseOut)
     this.compute()
     LayerMixin.onAdd.call(this, leafletMap)
-    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.onZoomEnd, this)
-    leafletMap.off('moveend', this.onMoveEnd, this)
     this.off('click', this.onClick)
     this.off('mouseover', this.onMouseOver)
     this.off('mouseout', this.onMouseOut)
@@ -218,12 +214,18 @@ export const Cluster = FeatureGroup.extend({
   },
 
   onZoomEnd: function () {
+    LayerMixin.onZoomEnd.call(this)
     this.removeClusters()
   },
 
   onMoveEnd: function () {
-    this.compute()
-    this.addClusters()
+    LayerMixin.onMoveEnd.call(this)
+    // In case of dynamic data, the LayerMixin.onMoveEnd
+    // call with fetch the data and then call the compute
+    if (!this.datalayer.hasDynamicData()) {
+      this.compute()
+      this.addClusters()
+    }
   },
 
   showCoverage(cluster) {
@@ -234,7 +236,9 @@ export const Cluster = FeatureGroup.extend({
   },
 
   hideCoverage() {
-    if (this._shownCoverage) this._map.removeLayer(this._shownCoverage)
+    if (this._shownCoverage && this._map) {
+      this._map.removeLayer(this._shownCoverage)
+    }
   },
 
   onMouseOver(event) {
@@ -259,7 +263,7 @@ export const Cluster = FeatureGroup.extend({
       'properties.cluster.radius',
       {
         handler: 'Range',
-        min: 40,
+        min: 10,
         max: 200,
         step: 10,
         placeholder: translate('Clustering radius'),

{umap_project-3.3.3 → umap_project-3.3.5}/umap/static/umap/js/modules/rendering/ui.js

@@ -137,9 +137,9 @@ const PointMixin = {
       delete this._originalLatLng
       this.once('editable:edited', () => {
         this.feature.datalayer.dataChanged()
+        this.feature.edit(event)
       })
     }
-    this.feature.edit(event)
   },
 
   _onMouseOut: function () {

{umap_project-3.3.3 → umap_project-3.3.5}/umap/static/umap/locale/de.js

@@ -518,8 +518,8 @@ const locale = {
     "Edit map default view": "Standardansicht der Karte bearbeiten",
     "Use current center and zoom": "Aktuelle Position und Zoomstufe speichern",
     "Layer permalink": "Permalink für Ebene",
-    "Back to home": "Back to home",
-    "Home logo": "Home logo",
+    "Back to home": "Zurück zur Startseite",
+    "Home logo": "Logo der Startseite",
     "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": "Letzte Bearbeitung abbrechen",
@@ -538,7 +538,7 @@ const locale = {
     "Cannot save layer, please try again in a few minutes.": "Ebene konnte nicht gespeichert werden. Bitte versuche es in ein paar Minuten erneut.",
     "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": "More help resources",
-    "This map is a template": "This map is a template",
+    "This map is a template": "Die Karte ist eine Vorlage",
     "Add text along path": "Add text along path",
     "Text color": "Textfarbe",
     "Text offset": "Text offset",
@@ -555,67 +555,67 @@ const locale = {
     "From community": "Von der Community",
     "You must select a template.": "Du musst eine Vorlage auswählen.",
     "Line decoration": "Line decoration",
-    "Reuse this template": "Reuse this template",
+    "Reuse this template": "Vorlage wiederverwenden",
     "Create a new map using this template": "Erstelle eine neue Karte aus dieser Vorlage.",
     "Save template": "Vorlage speichern",
     "Load template": "Vorlage laden",
-    "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",
+    "Loading a template will apply predefined styles and settings to your map": "Eine Vorlage zu laden wird die vordefinierten Stiele und Einstellungen auf die Karte anwenden.",
+    "Load template with data": "Vorlagen mit Daten laden",
+    "You have no registered template yet. You can add one by creating a new map and flagging it as \"template\".": "Du hast noch keine Vorlage eingetragen. Füge eine hinzu, indem du eine neue Karte erstellst und als \"Vorlage\" markierst.",
+    "There is no recommended template yet. Recommended templates are the ones starred by uMap administrators.": "Es gibt noch keine empfohlene Vorlage. Empfohlene Vorlagen werden von uMap Adminstratoren markiert.",
+    "There is no public template yet.": "Es gibt noch keine öffentliche Vorlage",
+    "Explore": "Erkunden",
     "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.",
+    "Limit results to current map view": "Treffer auf aktuelle Ansicht einschränken",
+    "Please choose an instance first.": "Bitte zuerst eine Instanz wählen",
     "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",
+    "Add a new field": "Neues Feld hinzufügen",
+    "Are you sure you want to delete this field on all the features?": "Bist du dir sicher dieses Feld in allen Einstellungen zu löschen?",
+    "Please enter the new name of this field": "Bitte den neuen Namen des Feldes eingeben",
+    "Cannot process MultiPoint": "Multipoint kann nicht verarbeitet werden",
+    "Manage Fields": "Felder bearbeiten",
+    "Rename this field": "Feld umbennen",
+    "Delete this field": "Feld löschen",
+    "Double click to edit the name": "Doppel-Klick um den Namen zu ändern",
+    "Print map": "Karte drucken",
+    "Choose a format": "Format wählen",
+    "Scale map": "Karte skalieren",
+    "portrait": "Langformat",
+    "landscape": "Querformat",
+    "Print": "Drucken",
+    "Preparing the print…": "Druck vorbereiten...",
+    "Large Circle": "Großer Kreis",
+    "Icon size": "Icon Größe",
+    "Will only affect raw and large circle icons.": "Das wird nur ursprüngliche- und große Kreisicons beinflussen.",
+    "Route": "Strecke",
+    "Display the print control": "Druckeinstellungen anzeigen",
     "Compute isochrone from here": "Compute isochrone from here",
-    "Route settings": "Route settings",
+    "Route settings": "Strecken Einstellungen",
     "Transform to regular line": "Transform to regular line",
-    "Transform to route": "Transform to route",
-    "Restore route": "Restore route",
-    "Compute elevation": "Compute elevation",
-    "Profile": "Profile",
+    "Transform to route": "In Strecke umwandeln",
+    "Restore route": "Strecke wiederherstellen",
+    "Profile": "Profil",
     "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"
+    "Route preference": "Streckenvoreinstellung",
+    "Compute route": "Strecke berechnen",
+    "Walking": "Gehen",
+    "Hiking": "Wandern",
+    "By car": "mit Auto",
+    "Cycling": "Fahrradfahren",
+    "Wheelchair": "Rollstuhl",
+    "Recommended": "Empfohlen",
+    "Fastest": "Am Schnellsten",
+    "Shortest": "Am Kürzesten",
+    "Max time (in minutes)": "Maximale Zeit (in Minuten)",
+    "Number of lines": "Zeilennummern",
+    "Distance:": "Entfernung:",
+    "Gain:": "Anstieg:",
+    "Loss:": "Abstieg:",
+    "Altitude:": "Höhe:",
+    "Right-click to edit": "Rechts-Klick zum editieren",
+    "Draw along routes": "Draw along routes",
+    "Skipping invalid geometry": "Skipping invalid geometry"
 }
 L.registerLocale("de", locale)
 L.setLocale("de")