umap-project 3.0.2__tar.gz → 3.0.3__tar.gz

{umap_project-3.0.2 → umap_project-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.0.2
+Version: 3.0.3
 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.0.3/umap/__init__.py

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

{umap_project-3.0.2 → umap_project-3.0.3}/umap/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-04 16:49+0000\n"
+"POT-Creation-Date: 2025-04-11 15:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -663,7 +663,11 @@ msgstr[1] ""
 msgid "No map found."
 msgstr ""
 
-#: templates/umap/search.html:35
+#: templates/umap/search.html:36
+msgid "Latest created maps in category"
+msgstr ""
+
+#: templates/umap/search.html:43
 msgid "Latest created maps"
 msgstr ""
 
@@ -784,25 +788,25 @@ msgstr ""
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1051
+#: views.py:1054
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1077
+#: views.py:1080
 #, 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 ""
 
-#: views.py:1082
+#: views.py:1085
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1336
+#: views.py:1339
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1358
+#: views.py:1361
 msgid "Permissions updated with success!"
 msgstr ""

{umap_project-3.0.2 → umap_project-3.0.3}/umap/locale/fr/LC_MESSAGES/django.po

@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-04 16:49+0000\n"
+"POT-Creation-Date: 2025-04-11 15:30+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2025\n"
 "Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n"
@@ -682,7 +682,11 @@ msgstr[2] "%(count)s cartes trouvées :"
 msgid "No map found."
 msgstr "Aucune carte trouvée."
 
-#: templates/umap/search.html:35
+#: templates/umap/search.html:36
+msgid "Latest created maps in category"
+msgstr "Dernières cartes créées dans la catégorie"
+
+#: templates/umap/search.html:43
 msgid "Latest created maps"
 msgstr "Dernières cartes créées."
 
@@ -803,25 +807,25 @@ msgstr "Courriel envoyé à %(email)s"
 msgid "Only its owner can delete the map."
 msgstr "Seul le créateur de la carte peut la supprimer."
 
-#: views.py:1051
+#: views.py:1054
 msgid "Map successfully deleted."
 msgstr "La carte a bien été supprimée."
 
-#: views.py:1077
+#: views.py:1080
 #, 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 "Votre carte a été dupliquée ! Si vous souhaitez la modifier depuis un autre ordinateur, veuillez utiliser ce lien : %(anonymous_url)s"
 
-#: views.py:1082
+#: views.py:1085
 msgid "Congratulations, your map has been cloned!"
 msgstr "Votre carte a été dupliquée !"
 
-#: views.py:1336
+#: views.py:1339
 msgid "Layer successfully deleted."
 msgstr "Calque supprimé."
 
-#: views.py:1358
+#: views.py:1361
 msgid "Permissions updated with success!"
 msgstr "Les permissions ont bien été modifiées !"

{umap_project-3.0.2 → umap_project-3.0.3}/umap/locale/nl/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-03 17:36+0000\n"
+"POT-Creation-Date: 2025-04-11 15:30+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: Gideon van Melle <translations@gvmelle.com>, 2025\n"
 "Language-Team: Dutch (http://app.transifex.com/openstreetmap/umap/language/nl/)\n"
@@ -38,137 +38,205 @@ msgstr "Site is 'alleen lezen' wegens onderhoud"
 msgid ""
 "Using “%(name)s” to authenticate is deprecated and will be removed soon. "
 "Please configure another provider below before losing access to your account"
-" and maps."
-msgstr ""
+" and maps. Then, please logout and login again with the new provider."
+msgstr "Het gebruik van %(name)s om te verifiëren is afgeschaft en zal binnenkort worden verwijderd. Configureer hieronder een andere provider voordat u de toegang tot uw account en kaarten verliest. Log uit en log opnieuw in met de nieuwe provider."
 
-#: models.py:60 models.py:79
+#: models.py:61 models.py:80
 msgid "name"
 msgstr "naam"
 
-#: models.py:62 models.py:485
+#: models.py:63 models.py:493
 msgid "description"
 msgstr "omschrijving"
 
-#: models.py:110
+#: models.py:111
 msgid "details"
 msgstr "details"
 
-#: models.py:111
+#: models.py:112
 msgid "Link to a page where the licence is detailed."
 msgstr "Link naar pagina waar de licentie details staan"
 
-#: models.py:121
+#: models.py:122
 msgid "URL template using OSM tile format"
 msgstr "URL-sjabloon met OSM tegel-formaat"
 
-#: models.py:127
+#: models.py:128
 msgid "Order of the tilelayers in the edit box"
 msgstr "Volgorde van de tegel-lagen in het bewerkingsvak."
 
-#: models.py:175 models.py:479
+#: models.py:176 models.py:487
 msgid "Only editable with secret edit link"
 msgstr "Alleen te bewerken met een geheime link"
 
-#: models.py:176 models.py:480
+#: models.py:177 models.py:488
 msgid "Everyone can edit"
 msgstr "Iedereen kan wijzigingen maken"
 
-#: models.py:179 models.py:473
+#: models.py:180 models.py:481
 msgid "Everyone"
 msgstr "Iedereen"
 
-#: models.py:180 models.py:189 models.py:474
+#: models.py:181 models.py:190 models.py:482
 msgid "Editors and team only"
 msgstr "Alleen redacteuren en team"
 
-#: models.py:181 models.py:475
+#: models.py:182 models.py:483
 msgid "Owner only"
 msgstr "Alleen eigenaar"
 
-#: models.py:184
+#: models.py:185
 msgid "Draft (private)"
 msgstr "Ontwerp (privé)"
 
-#: models.py:185
+#: models.py:186
 msgid "Everyone (public)"
 msgstr "Iedereen (openbaar)"
 
-#: models.py:188
+#: models.py:189
 msgid "Anyone with link"
 msgstr "Iedereen met een link"
 
-#: models.py:190
+#: models.py:191
 msgid "Blocked"
 msgstr "geblokkeerd"
 
-#: models.py:191 models.py:469
+#: models.py:192 models.py:477
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: models.py:194
+#: models.py:195
 msgid "center"
 msgstr "centreer"
 
-#: models.py:195
+#: models.py:196
 msgid "zoom"
 msgstr "zoom"
 
-#: models.py:197
+#: models.py:198
 msgid "locate"
 msgstr "zoek"
 
-#: models.py:197
+#: models.py:198
 msgid "Locate user on load?"
 msgstr "Gebruiker zoeken tijdens laden?"
 
-#: models.py:201
+#: models.py:202
 msgid "Choose the map licence."
 msgstr "Kies de kaartlicentie"
 
-#: models.py:202
+#: models.py:203
 msgid "licence"
 msgstr "Licentie"
 
-#: models.py:213
+#: models.py:214
 msgid "owner"
 msgstr "eigenaar"
 
-#: models.py:217
+#: models.py:218
 msgid "editors"
 msgstr "editors"
 
-#: models.py:223
+#: models.py:224
 msgid "team"
 msgstr "team"
 
-#: models.py:229 models.py:501
+#: models.py:230 models.py:509
 msgid "edit status"
 msgstr "wijzig status"
 
-#: models.py:234 models.py:506
+#: models.py:235 models.py:514
 msgid "share status"
 msgstr "deel status"
 
-#: models.py:237 models.py:496
+#: models.py:238 models.py:504
 msgid "settings"
 msgstr "instellingen"
 
-#: models.py:407
+#: models.py:410
 msgid "Clone of"
 msgstr "Kopie van"
 
-#: models.py:468 models.py:472 models.py:478
+#: models.py:476 models.py:480 models.py:486
 msgid "Inherit"
 msgstr "overerven"
 
-#: models.py:491
+#: models.py:499
 msgid "display on load"
 msgstr "toon tijdens laden"
 
-#: models.py:492
+#: models.py:500
 msgid "Display this layer on load."
 msgstr "Toon deze laag tijdens laden."
 
+#: settings/base.py:295
+msgid "Art and Culture"
+msgstr "Kunst en cultuur"
+
+#: settings/base.py:296
+msgid "Cycling"
+msgstr "Fietsen"
+
+#: settings/base.py:297
+msgid "Business"
+msgstr "Zakelijk"
+
+#: settings/base.py:298
+msgid "Environment"
+msgstr "Mlieu"
+
+#: settings/base.py:299
+msgid "Education"
+msgstr "Educatie"
+
+#: settings/base.py:300
+msgid "Food and Agriculture"
+msgstr "Voedsel en landbouw"
+
+#: settings/base.py:301
+msgid "Geopolitics"
+msgstr "Geopolitiek"
+
+#: settings/base.py:302
+msgid "Health"
+msgstr "Gezondheid"
+
+#: settings/base.py:303
+msgid "Hiking"
+msgstr "Hiking"
+
+#: settings/base.py:304
+msgid "History"
+msgstr "Geschiedenis"
+
+#: settings/base.py:305
+msgid "Public sector"
+msgstr "Publieke sector"
+
+#: settings/base.py:306
+msgid "Science"
+msgstr "Wetenschap"
+
+#: settings/base.py:307
+msgid "Shopping"
+msgstr "Winkelen"
+
+#: settings/base.py:308
+msgid "Sport and Leisure"
+msgstr "Sport en vrijetijd"
+
+#: settings/base.py:309
+msgid "Travel"
+msgstr "Reizen"
+
+#: settings/base.py:310
+msgid "Transports"
+msgstr "Transport"
+
+#: settings/base.py:311
+msgid "Tourism"
+msgstr "Toerisme"
+
 #: templates/403.html:8
 msgid ""
 "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
@@ -421,7 +489,7 @@ msgstr "Mijn teams"
 msgid "Map of the uMaps"
 msgstr "Kaart van de uMaps"
 
-#: templates/umap/home.html:24
+#: templates/umap/home.html:25
 msgid "Get inspired, browse maps"
 msgstr "Laat u inspireren, blader door kaarten"
 
@@ -429,11 +497,15 @@ msgstr "Laat u inspireren, blader door kaarten"
 msgid "You are logged in. Continuing..."
 msgstr "U bent ingelogd. Ga verder..."
 
-#: templates/umap/map_list.html:11 views.py:437
+#: templates/umap/map_list.html:18 views.py:444
 msgid "by"
 msgstr "door"
 
-#: templates/umap/map_list.html:20
+#: templates/umap/map_list.html:22
+msgid "See the map"
+msgstr "Zie de kaart"
+
+#: templates/umap/map_list.html:28
 msgid "More"
 msgstr "Meer"
 
@@ -592,11 +664,15 @@ msgid_plural "%(count)s maps found:"
 msgstr[0] "%(count)s kaarten gevonden:"
 msgstr[1] "%(count)s kaarten gevonden:"
 
-#: templates/umap/search.html:28
+#: templates/umap/search.html:30
 msgid "No map found."
 msgstr "Geen kaart gevonden."
 
-#: templates/umap/search.html:33
+#: templates/umap/search.html:36
+msgid "Latest created maps in category"
+msgstr ""
+
+#: templates/umap/search.html:43
 msgid "Latest created maps"
 msgstr "Laatste gemaakte kaarten"
 
@@ -604,7 +680,11 @@ msgstr "Laatste gemaakte kaarten"
 msgid "Search maps"
 msgstr "Zoek kaarten"
 
-#: templates/umap/search_bar.html:16
+#: templates/umap/search_bar.html:14
+msgid "Any category"
+msgstr "Elke categorie"
+
+#: templates/umap/search_bar.html:19
 msgid "Search"
 msgstr "Zoeken"
 
@@ -668,70 +748,70 @@ msgstr "Gebruikers"
 msgid "New team"
 msgstr "Nieuw Team"
 
-#: views.py:234
+#: views.py:235
 msgid "Cannot delete a team with more than one member"
 msgstr "Kan een team met meer dan één lid niet verwijderen"
 
-#: views.py:238
+#: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
 msgstr "Team “%(name)s” is verwijderd"
 
-#: views.py:442
+#: views.py:449
 msgid "View the map"
 msgstr "Bekijk de kaart"
 
-#: views.py:838
+#: views.py:845
 msgid "See full screen"
 msgstr "Volledig scherm weergeven"
 
-#: views.py:981
+#: views.py:988
 msgid "Map editors updated with success!"
 msgstr "Kaarteditors met succes bijgewerkt!"
 
-#: views.py:1017
+#: views.py:1024
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "De uMap-bewerkingslink voor uw kaart: %(map_name)s"
 
-#: views.py:1020
+#: views.py:1027
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Hier is je geheime bewerkingslink: %(link)s"
 
-#: views.py:1027
+#: views.py:1034
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "Kan geen e-mail verzenden naar %(email)s"
 
-#: views.py:1030
+#: views.py:1037
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "E-mail verzonden naar %(email)s"
 
-#: views.py:1041
+#: views.py:1048
 msgid "Only its owner can delete the map."
 msgstr "Kaart kan alleen door eigenaar worden verwijderd."
 
-#: views.py:1044
+#: views.py:1054
 msgid "Map successfully deleted."
 msgstr "Kaart succesvol verwijderd."
 
-#: views.py:1070
+#: views.py:1080
 #, 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 "Uw kaart is gekopieerd! Als u deze kaart wilt wijzigen vanaf een andere computer, gebruik dan deze link: %(anonymous_url)s"
 
-#: views.py:1075
+#: views.py:1085
 msgid "Congratulations, your map has been cloned!"
 msgstr "Gefeliciteerd, uw kaart is gekopieerd!"
 
-#: views.py:1329
+#: views.py:1339
 msgid "Layer successfully deleted."
 msgstr "Laag is verwijderd."
 
-#: views.py:1351
+#: views.py:1361
 msgid "Permissions updated with success!"
 msgstr "Machtigingen met succes bijgewerkt!"

{umap_project-3.0.2 → umap_project-3.0.3}/umap/settings/base.py

@@ -164,8 +164,8 @@ LOGIN_REDIRECT_URL = "login_popup_end"
 STATIC_URL = "/static/"
 MEDIA_URL = "/uploads/"
 
-STATIC_ROOT = os.path.join("static")
-MEDIA_ROOT = os.path.join("uploads")
+STATIC_ROOT = env("STATIC_ROOT", default=os.path.join("static"))
+MEDIA_ROOT = env("MEDIA_ROOT", default=os.path.join("uploads"))
 
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/base.css

@@ -235,3 +235,7 @@ dt {
     display: block;
     overflow-x: auto;
 }
+mark {
+    background-color: var(--color-lightCyan);
+    padding: 0 var(--small-box-padding);
+}

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/css/bar.css

@@ -167,7 +167,7 @@
 .umap-caption-bar .umap-map-author {
     margin-inline-end: 10px;
 }
-.umap-caption-bar > button + button:after,
+.umap-caption-bar:has(select:not([hidden])) > button + button:after,
 .umap-caption-bar > button + button:before {
     content: '|';
     padding-inline-start: 10px;

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/js/modules/browser.js

@@ -232,6 +232,7 @@ export default class Browser {
     toggle.addEventListener('click', () => this.toggleLayers())
     fitBounds.addEventListener('click', () => this._umap.fitDataBounds())
     download.addEventListener('click', () => this.downloadVisible(download))
+    download.hidden = this._umap.getProperty('embedControl') === false
   }
 
   downloadVisible(element) {

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/js/modules/caption.js

@@ -74,10 +74,10 @@ export default class Caption extends Utils.WithTemplate {
     this.addCredits()
     if (this._umap.properties.created_at) {
       const created_at = translate('created at {date}', {
-        date: new Date(this._umap.properties.created_at).toLocaleDateString(),
+        date: this._umap.createdAt.toLocaleDateString(),
       })
       const modified_at = translate('modified at {date}', {
-        date: new Date(this._umap.properties.modified_at).toLocaleDateString(),
+        date: this._umap.modifiedAt.toLocaleDateString(),
       })
       this.elements.dates.innerHTML = `${created_at} - ${modified_at}`
     } else {

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/js/modules/data/features.js

@@ -146,14 +146,13 @@ class Feature {
   }
 
   onCommit() {
+    this.pullGeometry(false)
     // When the layer is a remote layer, we don't want to sync the creation of the
     // points via the websocket, as the other peers will get them themselves.
-    const oldGeoJSON = this._just_married ? null : Utils.CopyJSON(this.toGeoJSON())
-    this.pullGeometry(false)
     if (this.datalayer?.isRemoteLayer()) return
-    if (this._just_married) {
+    if (this._needs_upsert) {
       this.sync.upsert(this.toGeoJSON(), null)
-      this._just_married = false
+      this._needs_upsert = false
     } else {
       this.sync.update('geometry', this.geometry, this._geometry_bk)
     }

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/js/modules/data/layer.js

@@ -220,6 +220,7 @@ export class DataLayer {
     this._loading = true
     const [geojson, response, error] = await this._umap.server.get(this._dataUrl())
     if (!error) {
+      this._umap.modifiedAt = response.headers.get('last-modified')
       this.setReferenceVersion({ response, sync: false })
       // FIXME: for now the _umap_options property is set dynamically from backend
       // And thus it's not in the geojson file in the server
@@ -303,7 +304,10 @@ export class DataLayer {
   async getUrl(url, initialUrl) {
     const response = await this._umap.request.get(url)
     return new Promise((resolve) => {
-      if (response?.ok) return resolve(response.text())
+      if (response?.ok) {
+        this._umap.modifiedAt = response.headers.get('last-modified')
+        return resolve(response.text())
+      }
       Alert.error(
         translate('Cannot load remote data for layer "{layer}" with url "{url}"', {
           layer: this.getName(),
@@ -414,6 +418,10 @@ export class DataLayer {
 
   removeFeature(feature, sync) {
     const id = stamp(feature)
+    // This feature was not yet added, may be after
+    // hitting Escape while drawing a new line or
+    // polygon, not yet valid (not enough points)
+    if (!this._index.includes(id)) return
     if (sync !== false) {
       const oldValue = feature.toGeoJSON()
       feature.sync.delete(oldValue)

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/js/modules/form/fields.js

@@ -808,9 +808,10 @@ Fields.IconUrl = class extends Fields.BlurInput {
   }
 
   addCategory(items, name) {
+    const hidden = name ? '' : ' hidden'
     const [parent, { grid }] = Utils.loadTemplateWithRefs(`
       <div class="umap-pictogram-category">
-        <h6 hidden=${!name}>${name}</h6>
+        <h6${hidden}>${name}</h6>
         <div class="umap-pictogram-grid" data-ref=grid></div>
       </div>
     `)
@@ -924,7 +925,8 @@ Fields.Url = class extends Fields.Input {
 Fields.Switch = class extends Fields.CheckBox {
   getTemplate() {
     const label = this.properties.label
-    return `${super.getTemplate()}<label title="${label}" for="${this.id}" data-ref=customLabel>${label}</label>`
+    const help = this.properties.helpEntries?.join() || ''
+    return `${super.getTemplate()}<label title="${label}" for="${this.id}" data-ref=customLabel data-help="${help}">${label}</label>`
   }
 
   build() {

{umap_project-3.0.2 → umap_project-3.0.3}/umap/static/umap/js/modules/importers/cadastrefr.js

@@ -8,18 +8,20 @@ import { AutocompleteCommunes } from './communesfr.js'
 const TEMPLATE = `
   <h3>Cadastre</h3>
   <p>Importer les données cadastrales d’une commune française.</p>
-  <select name="theme">
-    <option value="batiments">Bâtiments</option>
-    <option value="communes">Communes</option>
-    <option value="feuilles">Feuilles</option>
-    <option value="lieux_dits">Lieux dits</option>
-    <option value="parcelles" selected>Parcelles</option>
-    <option value="prefixes_sections">Préfixes sections</option>
-    <option value="sections">Sections</option>
-    <option value="subdivisions_fiscales">Subdivisions fiscales</option>
-  </select>
-  <label id="boundary">
-  </label>
+  <div class="formbox">
+    <select name="theme">
+      <option value="batiments">Bâtiments</option>
+      <option value="communes">Communes</option>
+      <option value="feuilles">Feuilles</option>
+      <option value="lieux_dits">Lieux dits</option>
+      <option value="parcelles" selected>Parcelles</option>
+      <option value="prefixes_sections">Préfixes sections</option>
+      <option value="sections">Sections</option>
+      <option value="subdivisions_fiscales">Subdivisions fiscales</option>
+    </select>
+    <label id="boundary">
+    </label>
+  </div>
 `
 
 export class Importer {