umap-project 2.0.4__py3-none-any.whl → 2.1.1__py3-none-any.whl

umap/locale/ms/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-15 13:53+0000\n"
+"POT-Creation-Date: 2024-03-25 12:41+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021,2023-2024\n"
 "Language-Team: Malay (http://app.transifex.com/openstreetmap/umap/language/ms/)\n"
@@ -27,7 +27,7 @@ msgstr "Hanya boleh disunting dengan pautan rahsia"
 msgid "Everyone can edit"
 msgstr "Sesiapa pun boleh sunting"
 
-#: forms.py:69 models.py:371
+#: forms.py:69 models.py:381
 msgid "Inherit"
 msgstr "Warisi"
 
@@ -35,107 +35,107 @@ msgstr "Warisi"
 msgid "Site is readonly for maintenance"
 msgstr "Laman dalam mod baca sahaja untuk penyenggaraan"
 
-#: models.py:50
+#: models.py:52
 msgid "name"
 msgstr "nama"
 
-#: models.py:81
+#: models.py:83
 msgid "details"
 msgstr "perincian"
 
-#: models.py:82
+#: models.py:84
 msgid "Link to a page where the licence is detailed."
 msgstr "Pautan ke halaman yang menyatakan lesennya."
 
-#: models.py:92
+#: models.py:94
 msgid "URL template using OSM tile format"
 msgstr "Templat URL menggunakan format fail OSM"
 
-#: models.py:98
+#: models.py:100
 msgid "Order of the tilelayers in the edit box"
 msgstr "Kedudukan lapisan jubin dalam kotak suntingan"
 
-#: models.py:144 models.py:372
+#: models.py:146 models.py:382
 msgid "Everyone"
 msgstr "Semua orang"
 
-#: models.py:145 models.py:151 models.py:373
+#: models.py:147 models.py:153 models.py:383
 msgid "Editors only"
 msgstr "Penyunting sahaja"
 
-#: models.py:146 models.py:374
+#: models.py:148 models.py:384
 msgid "Owner only"
 msgstr "Pemilik sahaja"
 
-#: models.py:149
+#: models.py:151
 msgid "Everyone (public)"
 msgstr "Semua orang (umum)"
 
-#: models.py:150
+#: models.py:152
 msgid "Anyone with link"
 msgstr "Sesiapa yang ada pautan"
 
-#: models.py:152
+#: models.py:154
 msgid "Blocked"
 msgstr "Disekat"
 
-#: models.py:155 models.py:378
+#: models.py:157 models.py:391
 msgid "description"
 msgstr "keterangan"
 
-#: models.py:156
+#: models.py:158
 msgid "center"
 msgstr "pertengahkan"
 
-#: models.py:157
+#: models.py:159
 msgid "zoom"
 msgstr "zum"
 
-#: models.py:159
+#: models.py:161
 msgid "locate"
 msgstr "mengesan"
 
-#: models.py:159
+#: models.py:161
 msgid "Locate user on load?"
 msgstr "Kesan kedudukan pengguna semasa dimuatkan?"
 
-#: models.py:163
+#: models.py:165
 msgid "Choose the map licence."
 msgstr "Pilih lesen peta."
 
-#: models.py:164
+#: models.py:166
 msgid "licence"
 msgstr "lesen"
 
-#: models.py:175
+#: models.py:177
 msgid "owner"
 msgstr "pemilik"
 
-#: models.py:179
+#: models.py:181
 msgid "editors"
 msgstr "penyunting"
 
-#: models.py:184 models.py:392
+#: models.py:186 models.py:405
 msgid "edit status"
 msgstr "status suntingan"
 
-#: models.py:189
+#: models.py:191
 msgid "share status"
 msgstr "status perkongsian"
 
-#: models.py:192 models.py:387
+#: models.py:194 models.py:400
 msgid "settings"
 msgstr "tetapan"
 
-#: models.py:320
+#: models.py:322
 msgid "Clone of"
 msgstr "Klon bagi"
 
-#: models.py:382
+#: models.py:395
 msgid "display on load"
 msgstr "paparkan semasa dimuatkan"
 
-#: models.py:383
+#: models.py:396
 msgid "Display this layer on load."
 msgstr "Paparkan lapisan ini ketika dimuatkan."
 
@@ -291,7 +291,7 @@ msgstr "Dapatkan inspirasi, layari peta-peta"
 msgid "You are logged in. Continuing..."
 msgstr "Anda telah log masuk. Menyambung..."
 
-#: templates/umap/map_list.html:9 views.py:341
+#: templates/umap/map_list.html:9 views.py:349
 msgid "by"
 msgstr "oleh"
 
@@ -327,57 +327,57 @@ msgstr "Pemilik"
 msgid "Actions"
 msgstr "Tindakan"
 
-#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
+#: templates/umap/map_table.html:26 templates/umap/map_table.html:28
 msgid "Open preview"
 msgstr "Buka pralihat"
 
-#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
+#: templates/umap/map_table.html:48 templates/umap/map_table.html:50
 msgid "Share"
 msgstr "Kongsi"
 
-#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
+#: templates/umap/map_table.html:54 templates/umap/map_table.html:56
 msgid "Edit"
 msgstr "Sunting"
 
-#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
+#: templates/umap/map_table.html:60 templates/umap/map_table.html:62
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
+#: templates/umap/map_table.html:66 templates/umap/map_table.html:68
 msgid "Clone"
 msgstr "Klon"
 
-#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
+#: templates/umap/map_table.html:76 templates/umap/map_table.html:78
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/umap/map_table.html:88
+#: templates/umap/map_table.html:91
 msgid "first"
 msgstr "pertama"
 
-#: templates/umap/map_table.html:89
+#: templates/umap/map_table.html:92
 msgid "previous"
 msgstr "sebelumnya"
 
-#: templates/umap/map_table.html:98
+#: templates/umap/map_table.html:100
 #, python-format
 msgid "Page %(maps_number)s of %(num_pages)s"
 msgstr "Halaman %(maps_number)s daripada %(num_pages)s"
 
-#: templates/umap/map_table.html:104
+#: templates/umap/map_table.html:105
 msgid "next"
 msgstr "seterusnya"
 
-#: templates/umap/map_table.html:105
+#: templates/umap/map_table.html:106
 msgid "last"
 msgstr "terakhir"
 
-#: templates/umap/map_table.html:113
+#: templates/umap/map_table.html:114
 #, python-format
 msgid "Lines per page: %(per_page)s"
 msgstr "Baris per halaman: %(per_page)s"
 
-#: templates/umap/map_table.html:118
+#: templates/umap/map_table.html:119
 #, python-format
 msgid "%(count)s maps"
 msgstr "%(count)s peta"
@@ -470,20 +470,20 @@ msgstr "Cari peta"
 msgid "Search"
 msgstr "Cari"
 
-#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
+#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:27
 msgid "Search my maps"
 msgstr "Gelintar peta saya"
 
-#: templates/umap/user_dashboard.html:11
+#: templates/umap/user_dashboard.html:10
 #, python-format
 msgid "My Maps (%(count)s)"
 msgstr "Peta Saya (%(count)s)"
 
-#: templates/umap/user_dashboard.html:13
+#: templates/umap/user_dashboard.html:12
 msgid "My profile"
 msgstr "Profil saya"
 
-#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
+#: templates/umap/user_dashboard.html:20 templates/umap/user_dashboard.html:24
 msgid "Map’s title"
 msgstr "Tajuk peta"
 
@@ -496,52 +496,57 @@ msgstr "Muat turun %(count)s peta"
 msgid "You have no map yet."
 msgstr "Anda belum ada peta."
 
-#: views.py:346
+#: views.py:354
 msgid "View the map"
 msgstr "Lihat peta"
 
-#: views.py:704
+#: views.py:716
 msgid "See full screen"
 msgstr "Lihat skrin penuh"
 
-#: views.py:803
+#: views.py:817
 msgid "Map editors updated with success!"
 msgstr "Penyunting peta telah dikemas kini dengan jayanya!"
 
-#: views.py:841
+#: views.py:854
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "Pautan suntingan uMap untuk peta anda: %(map_name)s"
 
-#: views.py:844
+#: views.py:857
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Ini pautan suntingan rahsia anda: %(link)s"
 
-#: views.py:850
+#: views.py:864
+#, python-format
+msgid "Can't send email to %(email)s"
+msgstr "Tidak dapat menghantar e-mel kepada %(email)s"
+
+#: views.py:867
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "E-mel telah dihantar ke %(email)s"
 
-#: views.py:861
+#: views.py:878
 msgid "Only its owner can delete the map."
 msgstr "Hanya pemiliknya sahaja mampu memadamkan peta."
 
-#: views.py:889
+#: views.py:906
 #, 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 "Peta anda telah diklon! Jika anda ingin menyunting peta ini dari komputer lain, sila gunakan pautan ini: %(anonymous_url)s"
 
-#: views.py:894
+#: views.py:911
 msgid "Congratulations, your map has been cloned!"
 msgstr "Tahniah, peta anda telah berjaya diklon!"
 
-#: views.py:1130
+#: views.py:1145
 msgid "Layer successfully deleted."
 msgstr "Lapisan telah berjaya dipadamkan."
 
-#: views.py:1152
+#: views.py:1167
 msgid "Permissions updated with success!"
 msgstr "Kebenaran telah dikemas kini dengan jayanya!"

umap/migrations/0018_datalayer_uuid.py

@@ -0,0 +1,62 @@
+# Generated by Django 4.2.8 on 2024-02-19 17:40
+
+import uuid
+
+from django.db import migrations, models
+
+drop_index = """DO $$
+BEGIN
+    EXECUTE 'ALTER TABLE umap_datalayer DROP CONSTRAINT ' || (
+        SELECT indexname
+        FROM pg_indexes
+        WHERE tablename = 'umap_datalayer' AND indexname LIKE '%pk%'
+    );
+END $$;
+"""
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0017_migrate_to_openstreetmap_oauth2"),
+    ]
+
+    operations = [
+        # Add the new uuid field
+        migrations.AddField(
+            model_name="datalayer",
+            name="uuid",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, null=True, serialize=False
+            ),
+        ),
+        # Generate UUIDs for existing records
+        migrations.RunSQL(
+            "UPDATE umap_datalayer SET uuid = gen_random_uuid()",
+            reverse_sql=migrations.RunSQL.noop,
+        ),
+        # Remove the primary key constraint
+        migrations.RunSQL(drop_index, reverse_sql=migrations.RunSQL.noop),
+        # Drop the "id" primary key…
+        migrations.AlterField(
+            "datalayer", name="id", field=models.IntegerField(null=True, blank=True)
+        ),
+        # Rename "id" to "old id"
+        migrations.RenameField(
+            model_name="datalayer", old_name="id", new_name="old_id"
+        ),
+        # … to put it back on the "uuid"
+        migrations.AlterField(
+            model_name="datalayer",
+            name="uuid",
+            field=models.UUIDField(
+                default=uuid.uuid4,
+                editable=False,
+                unique=True,
+                primary_key=True,
+                serialize=False,
+            ),
+        ),
+        # When applying the migration backwards, we need to drop the pk index
+        # Before addding a new one.
+        migrations.RunSQL(migrations.RunSQL.noop, reverse_sql=drop_index),
+    ]

umap/migrations/0019_migrate_internal_remote_datalayers.py

@@ -0,0 +1,52 @@
+# Generated by Django 4.2 on 2024-02-26 14:09
+
+import re
+
+from django.conf import settings
+from django.db import migrations
+from django.urls import NoReverseMatch, reverse
+
+# Some users hacked uMap to use another map datalayer as a remote data source.
+# This script gently handles the migration for them.
+
+
+def migrate_datalayers(apps, schema_editor):
+    DataLayer = apps.get_model("umap", "DataLayer")
+
+    datalayers = DataLayer.objects.filter(
+        settings__remoteData__url__icontains="datalayer"
+    )
+
+    for item in datalayers:
+        old_url = item.settings["remoteData"]["url"]
+        match = re.search(
+            rf"{settings.SITE_URL}/datalayer/(?P<map_id>\d+)/(?P<datalayer_id>\d+)",
+            old_url,
+        )
+        if match:
+            remote_id = match.group("datalayer_id")
+            map_id = match.group("map_id")
+            try:
+                remote_uuid = DataLayer.objects.get(old_id=remote_id).uuid
+            except DataLayer.DoesNotExist:
+                pass
+            else:
+                try:
+                    new_url = settings.SITE_URL + reverse(
+                        "datalayer_view", args=[map_id, remote_uuid]
+                    )
+                except NoReverseMatch:
+                    pass
+                else:
+                    item.settings["remoteData"]["url"] = new_url
+                    item.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0018_datalayer_uuid"),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_datalayers, reverse_code=migrations.RunPython.noop)
+    ]

umap/models.py

@@ -1,6 +1,7 @@
 import json
 import os
 import time
+import uuid
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -9,6 +10,7 @@ from django.core.files.base import File
 from django.core.signing import Signer
 from django.template.defaultfilters import slugify
 from django.urls import reverse
+from django.utils.functional import classproperty
 from django.utils.translation import gettext_lazy as _
 
 from .managers import PublicManager
@@ -217,7 +219,7 @@ class Map(NamedModel):
                 "umap_id": self.pk,
                 "onLoadPanel": "none",
                 "captionBar": False,
-                "default_iconUrl": "%sumap/img/marker.svg" % settings.STATIC_URL,
+                "schema": self.extra_schema,
                 "slideshow": {},
             }
         )
@@ -328,6 +330,14 @@ class Map(NamedModel):
             datalayer.clone(map_inst=new)
         return new
 
+    @classproperty
+    def extra_schema(self):
+        return {
+            "iconUrl": {
+                "default": "%sumap/img/marker.svg" % settings.STATIC_URL,
+            }
+        }
+
 
 class Pictogram(NamedModel):
     """
@@ -373,7 +383,10 @@ class DataLayer(NamedModel):
         (EDITORS, _("Editors only")),
         (OWNER, _("Owner only")),
     )
-
+    uuid = models.UUIDField(
+        unique=True, primary_key=True, default=uuid.uuid4, editable=False
+    )
+    old_id = models.IntegerField(null=True, blank=True)
     map = models.ForeignKey(Map, on_delete=models.CASCADE)
     description = models.TextField(blank=True, null=True, verbose_name=_("description"))
     geojson = models.FileField(upload_to=upload_to, blank=True, null=True)
@@ -436,6 +449,7 @@ class DataLayer(NamedModel):
 
     def clone(self, map_inst=None):
         new = self.__class__.objects.get(pk=self.pk)
+        new._state.adding = True
         new.pk = None
         if map_inst:
             new.map = map_inst
@@ -444,7 +458,10 @@ class DataLayer(NamedModel):
         return new
 
     def is_valid_version(self, name):
-        return name.startswith("%s_" % self.pk) and name.endswith(".geojson")
+        valid_prefixes = [name.startswith("%s_" % self.pk)]
+        if self.old_id:
+            valid_prefixes.append(name.startswith("%s_" % self.old_id))
+        return any(valid_prefixes) and name.endswith(".geojson")
 
     def version_metadata(self, name):
         els = name.split(".")[0].split("_")

umap/settings/base.py

@@ -1,4 +1,5 @@
 """Base settings shared by all environments"""
+
 # Import global settings to make it easier to extend settings.
 from email.utils import parseaddr
 

umap/settings/dev.py

@@ -1,4 +1,5 @@
 """Settings for Development Server"""
+
 from umap.settings.base import *  # pylint: disable=W0614,W0401
 
 DEBUG = True

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

@@ -30,7 +30,7 @@ export default class Browser {
     title.textContent = feature.getDisplayName() || '—'
     const bgcolor = feature.getDynamicOption('color')
     colorBox.style.backgroundColor = bgcolor
-    if (symbol && symbol !== this.map.options.default_iconUrl) {
+    if (symbol && symbol !== U.SCHEMA.iconUrl.default) {
       const icon = U.Icon.makeIconElement(symbol, colorBox)
       U.Icon.setIconContrast(icon, colorBox, symbol, bgcolor)
     }
@@ -131,7 +131,7 @@ export default class Browser {
       'h3',
       'umap-browse-title',
       container,
-      this.map.options.name
+      this.map.getOption('name')
     )
 
     const formContainer = DomUtil.create('div', '', container)

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

@@ -1,10 +1,20 @@
-import * as L from '../../vendors/leaflet/leaflet-src.esm.js'
 import URLs from './urls.js'
 import Browser from './browser.js'
+import * as Utils from './utils.js'
+import {SCHEMA} from './schema.js'
 import { Request, ServerRequest, RequestError, HTTPError, NOKError } from './request.js'
+
 // Import modules and export them to the global scope.
 // For the not yet module-compatible JS out there.
 
-// Copy the leaflet module, it's expected by leaflet plugins to be writeable.
-window.L = { ...L }
-window.U = { URLs, Request, ServerRequest, RequestError, HTTPError, NOKError, Browser }
+window.U = {
+  URLs,
+  Request,
+  ServerRequest,
+  RequestError,
+  HTTPError,
+  NOKError,
+  Browser,
+  Utils,
+  SCHEMA,
+}

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

@@ -0,0 +1,35 @@
+// Comes from https://github.com/Leaflet/Leaflet/pull/9281
+import { Util } from '../../vendors/leaflet/leaflet-src.esm.js'
+
+export const locales = {}
+
+// @property locale: String
+// The current locale code, that will be used when translating strings.
+export let locale = null
+
+// @function registerLocale(code: String, locale?: Object): String
+// Define localized strings for a given locale, defined by `code`.
+export function registerLocale(code, locale) {
+  locales[code] = Util.extend({}, locales[code], locale)
+}
+// @function setLocale(code: String): undefined
+// Define or change the locale code to be used when translating strings.
+export function setLocale(code) {
+  locale = code
+}
+// @function translate(string: String, data?: Object): String
+// Actually try to translate the `string`, with optionnal variable passed in `data`.
+export function translate(string, data = {}) {
+  if (locale && locales[locale] && locales[locale][string] !== undefined) {
+    string = locales[locale][string]
+  }
+  try {
+    // Do not fail if some data is missing
+    // a bad translation should not break the app
+    string = Util.template(string, data)
+  } catch (err) {
+    console.error(err)
+  }
+
+  return string
+}

umap/static/umap/js/modules/leaflet-configure.js

@@ -0,0 +1,7 @@
+import * as L from '../../vendors/leaflet/leaflet-src.esm.js'
+// Comes from https://github.com/Leaflet/Leaflet/pull/9281
+// TODELETE once it's merged!
+import * as i18n from './i18n.js'
+
+window.L = { ...L, ...i18n }
+window.L._ = i18n.translate