umap-project 2.9.0b0__py3-none-any.whl → 2.9.1__py3-none-any.whl

umap/locale/zh_TW/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Supaplex <bejokeup@gmail.com>, 2019,2023-2024
+# Supaplex <bejokeup@gmail.com>, 2019,2023-2025
 # Chia-liang Kao <clkao@clkao.org>, 2014
 # coop.shen <coop.shen@gmail.com>, 2014
 # coop.shen <coop.shen@gmail.com>, 2014
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-24 08:39+0000\n"
+"POT-Creation-Date: 2025-03-03 17:36+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Supaplex <bejokeup@gmail.com>, 2019,2023-2024\n"
+"Last-Translator: Supaplex <bejokeup@gmail.com>, 2019,2023-2025\n"
 "Language-Team: Chinese (Taiwan) (http://app.transifex.com/openstreetmap/umap/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,17 +31,25 @@ msgstr "CSV 匯出"
 
 #: decorators.py:60
 msgid "This map is not publicly available"
-msgstr ""
+msgstr "這份地圖並非公開可及的"
 
-#: middleware.py:13
+#: middleware.py:19
 msgid "Site is readonly for maintenance"
 msgstr "網站目前因維護中設定為唯讀狀態"
 
+#: middleware.py:34
+#, python-format
+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 ""
+
 #: models.py:60 models.py:79
 msgid "name"
 msgstr "名稱"
 
-#: models.py:62 models.py:475
+#: models.py:62 models.py:485
 msgid "description"
 msgstr "描述"
 
@@ -61,23 +69,23 @@ msgstr "URL 樣板，使用 OSM 地圖磚格式"
 msgid "Order of the tilelayers in the edit box"
 msgstr "編輯方塊中地圖磚的圖層順序"
 
-#: models.py:175 models.py:469
+#: models.py:175 models.py:479
 msgid "Only editable with secret edit link"
 msgstr "僅能由私密連結編輯"
 
-#: models.py:176 models.py:470
+#: models.py:176 models.py:480
 msgid "Everyone can edit"
 msgstr "所有人皆可編輯"
 
-#: models.py:179 models.py:463
+#: models.py:179 models.py:473
 msgid "Everyone"
 msgstr "所有人"
 
-#: models.py:180 models.py:189 models.py:464
+#: models.py:180 models.py:189 models.py:474
 msgid "Editors and team only"
 msgstr "只有編輯者與團隊"
 
-#: models.py:181 models.py:465
+#: models.py:181 models.py:475
 msgid "Owner only"
 msgstr "只有擁有者"
 
@@ -97,7 +105,7 @@ msgstr "任何有連結的人"
 msgid "Blocked"
 msgstr "已經封銷了"
 
-#: models.py:191
+#: models.py:191 models.py:469
 msgid "Deleted"
 msgstr "已刪除"
 
@@ -137,31 +145,31 @@ msgstr "編輯者"
 msgid "team"
 msgstr "團隊"
 
-#: models.py:229 models.py:491
+#: models.py:229 models.py:501
 msgid "edit status"
 msgstr "編輯狀態"
 
-#: models.py:234
+#: models.py:234 models.py:506
 msgid "share status"
 msgstr "分享狀態"
 
-#: models.py:237 models.py:486
+#: models.py:237 models.py:496
 msgid "settings"
 msgstr "設定"
 
-#: models.py:402
+#: models.py:407
 msgid "Clone of"
 msgstr "複製"
 
-#: models.py:462 models.py:468
+#: models.py:468 models.py:472 models.py:478
 msgid "Inherit"
 msgstr "繼承"
 
-#: models.py:481
+#: models.py:491
 msgid "display on load"
 msgstr "載入時顯示"
 
-#: models.py:482
+#: models.py:492
 msgid "Display this layer on load."
 msgstr "載入此圖層時顯示"
 
@@ -170,50 +178,64 @@ msgid ""
 "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
 "target=\"_blank\">Find out here the documentation</a> on how to manage map’s"
 " permissions."
-msgstr ""
+msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">在說明文件尋找資訊</a>，要如何管理地圖權限。"
 
 #: templates/403.html:10 templates/404.html:8
 msgid "← Go to the homepage"
-msgstr ""
+msgstr "← 回到首頁"
 
 #: templates/404.html:7
 msgid "404 Page Not Found"
-msgstr ""
+msgstr "404 頁面"
 
-#: templates/auth/user_detail.html:8
+#: templates/auth/user_detail.html:6
+#, python-format
+msgid "%(current_user)s’s maps"
+msgstr "%(current_user)s的地圖"
+
+#: templates/auth/user_detail.html:12
 #, python-format
 msgid "Browse %(current_user)s's maps"
 msgstr "瀏覽 %(current_user)s 的地圖"
 
-#: templates/auth/user_detail.html:17
+#: templates/auth/user_detail.html:21
 #, python-format
 msgid "%(current_user)s has no maps."
 msgstr "%(current_user)s 沒有任何地圖。"
 
-#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
+#: templates/auth/user_form.html:6
+msgid "My Profile"
+msgstr "我的檔案"
+
+#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
 msgid "Save"
 msgstr "儲存"
 
-#: templates/auth/user_form.html:27
+#: templates/auth/user_form.html:30
 msgid "Your current providers"
 msgstr "你目前的供應商"
 
-#: templates/auth/user_form.html:39
+#: templates/auth/user_form.html:44
 msgid "Connect to another provider"
 msgstr "連線到其他供應商"
 
-#: templates/auth/user_form.html:42
+#: templates/auth/user_form.html:47
 msgid ""
 "It's a good habit to connect your account to more than one provider, in case"
 " one provider becomes unavailable, temporarily or even permanently."
 msgstr "用你的帳號連到多個供應商是好的習慣，因為有時候供應商會出狀況，甚至永久停止運作。"
 
-#: templates/auth/user_stars.html:8
+#: templates/auth/user_stars.html:6
+#, python-format
+msgid "%(current_user)s’s starred maps"
+msgstr "%(current_user)s的打星號地圖"
+
+#: templates/auth/user_stars.html:12
 #, python-format
 msgid "Browse %(current_user)s's starred maps"
 msgstr "瀏覽 %(current_user)s 已打心號的地圖"
 
-#: templates/auth/user_stars.html:17
+#: templates/auth/user_stars.html:21
 #, python-format
 msgid "%(current_user)s has no starred maps yet."
 msgstr "%(current_user)s 沒有任何打心號的地圖。"
@@ -248,6 +270,10 @@ msgstr "密碼"
 msgid "Please choose a provider:"
 msgstr "請選擇提供商："
 
+#: templates/umap/about.html:5 templates/umap/navigation.html:22
+msgid "About"
+msgstr "關於"
+
 #: templates/umap/about_summary.html:12
 #, python-format
 msgid ""
@@ -415,7 +441,7 @@ msgstr "由"
 msgid "More"
 msgstr "更多"
 
-#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
+#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
 msgid "Name"
 msgstr "名稱"
 
@@ -439,7 +465,7 @@ msgstr "最後儲存"
 msgid "Owner"
 msgstr "擁有者"
 
-#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
+#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
 msgid "Actions"
 msgstr "動作"
 
@@ -452,7 +478,7 @@ msgid "Share"
 msgstr "分享"
 
 #: templates/umap/map_table.html:78 templates/umap/map_table.html:80
-#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
+#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
 msgid "Edit"
 msgstr "編輯"
 
@@ -515,10 +541,6 @@ msgstr "登入"
 msgid "Sign in"
 msgstr "註冊"
 
-#: templates/umap/navigation.html:22
-msgid "About"
-msgstr "關於"
-
 #: templates/umap/navigation.html:30
 msgid "Change password"
 msgstr "更改密碼"
@@ -527,51 +549,57 @@ msgstr "更改密碼"
 msgid "Log out"
 msgstr "登出"
 
-#: templates/umap/password_change.html:7
+#: templates/umap/password_change.html:6
+#: templates/umap/password_change.html:11
 msgid "Password change"
 msgstr "密碼變更"
 
-#: templates/umap/password_change.html:10
+#: templates/umap/password_change.html:14
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
 msgstr "為確保賬戸安全，請先輸入你的舊有密碼。然後輸入新密碼兩次，以便確認新密碼輸入正確。"
 
-#: templates/umap/password_change.html:17
+#: templates/umap/password_change.html:21
 msgid "Old password"
 msgstr "舊密碼"
 
-#: templates/umap/password_change.html:22
+#: templates/umap/password_change.html:26
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/umap/password_change.html:26
+#: templates/umap/password_change.html:30
 msgid "New password confirmation"
 msgstr "再次輸入新密碼"
 
-#: templates/umap/password_change.html:27
+#: templates/umap/password_change.html:31
 msgid "Change my password"
 msgstr "更改我的密碼"
 
-#: templates/umap/password_change_done.html:7
+#: templates/umap/password_change_done.html:6
+#: templates/umap/password_change_done.html:11
 msgid "Password change successful"
 msgstr "成功更改密碼"
 
-#: templates/umap/password_change_done.html:10
+#: templates/umap/password_change_done.html:14
 msgid "Your password was changed."
 msgstr "你的密碼已更改。"
 
-#: templates/umap/search.html:15
+#: templates/umap/search.html:6
+msgid "Explore maps"
+msgstr "瀏覽地圖"
+
+#: templates/umap/search.html:19
 #, python-format
 msgid "%(count)s map found:"
 msgid_plural "%(count)s maps found:"
 msgstr[0] "已找到%(count)s份地圖："
 
-#: templates/umap/search.html:24
+#: templates/umap/search.html:28
 msgid "No map found."
 msgstr "找不到地圖。"
 
-#: templates/umap/search.html:29
+#: templates/umap/search.html:33
 msgid "Latest created maps"
 msgstr "最新創建地圖"
 
@@ -579,25 +607,38 @@ msgstr "最新創建地圖"
 msgid "Search maps"
 msgstr "搜尋地圖"
 
-#: templates/umap/search_bar.html:15
+#: templates/umap/search_bar.html:16
 msgid "Search"
 msgstr "搜尋"
 
-#: templates/umap/team_detail.html:10
+#: templates/umap/team_confirm_delete.html:6
+msgid "Team deletion"
+msgstr "團隊刪除"
+
+#: templates/umap/team_detail.html:6
+#, python-format
+msgid "%(current_team)s’s maps"
+msgstr "%(current_team)s的地圖"
+
+#: templates/umap/team_detail.html:14
 #, python-format
 msgid "Browse %(current_team)s's maps"
 msgstr "瀏覽%(current_team)s的地圖"
 
-#: templates/umap/team_detail.html:22
+#: templates/umap/team_detail.html:26
 #, python-format
 msgid "%(current_team)s has no public maps."
 msgstr "%(current_team)s沒有公開地圖"
 
-#: templates/umap/team_form.html:24
+#: templates/umap/team_form.html:6
+msgid "Create or edit a team"
+msgstr "創建或是編輯團隊"
+
+#: templates/umap/team_form.html:28
 msgid "Delete this team"
 msgstr "刪除這個團隊"
 
-#: templates/umap/team_form.html:47
+#: templates/umap/team_form.html:51
 msgid "Add user"
 msgstr "新增使用者"
 
@@ -618,11 +659,15 @@ msgstr "下載%(count)s地圖"
 msgid "You have no map yet."
 msgstr "你目前還沒有地圖。"
 
-#: templates/umap/user_teams.html:17
+#: templates/umap/user_teams.html:6
+msgid "My Teams"
+msgstr "我的團隊"
+
+#: templates/umap/user_teams.html:21
 msgid "Users"
 msgstr "使用者"
 
-#: templates/umap/user_teams.html:48
+#: templates/umap/user_teams.html:52
 msgid "New team"
 msgstr "新的團隊"
 
@@ -639,57 +684,57 @@ msgstr "已經刪除團隊 \"%(name)s\" "
 msgid "View the map"
 msgstr "檢視地圖"
 
-#: views.py:825
+#: views.py:838
 msgid "See full screen"
 msgstr "檢視全螢幕"
 
-#: views.py:968
+#: views.py:981
 msgid "Map editors updated with success!"
 msgstr "地圖編輯者更新完成"
 
-#: views.py:1004
+#: views.py:1017
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "你的地圖 uMap 編輯連結：%(map_name)s"
 
-#: views.py:1007
+#: views.py:1020
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "這是你的祕密編輯連結：%(link)s"
 
-#: views.py:1014
+#: views.py:1027
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "無法傳送電子郵件到%(email)s"
 
-#: views.py:1017
+#: views.py:1030
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "電子郵件寄至 %(email)s"
 
-#: views.py:1028
+#: views.py:1041
 msgid "Only its owner can delete the map."
 msgstr "只有擁有者可以刪除此地圖"
 
-#: views.py:1031
+#: views.py:1044
 msgid "Map successfully deleted."
 msgstr "成功刪除地圖"
 
-#: views.py:1057
+#: views.py:1070
 #, 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 "您的地圖已複製完成！如果您想在不同的機器編輯這個地圖，請使用這個連結：%(anonymous_url)s"
 
-#: views.py:1062
+#: views.py:1075
 msgid "Congratulations, your map has been cloned!"
 msgstr "恭喜，您的地圖已被複製！"
 
-#: views.py:1313
+#: views.py:1329
 msgid "Layer successfully deleted."
 msgstr "圖層已刪除"
 
-#: views.py:1335
+#: views.py:1351
 msgid "Permissions updated with success!"
 msgstr "權限更新完成"

umap/middleware.py

@@ -1,6 +1,12 @@
 from django.conf import settings
+from django.contrib import messages
+from django.contrib.auth import BACKEND_SESSION_KEY
 from django.core.exceptions import MiddlewareNotUsed
-from django.http import HttpResponseForbidden
+from django.http import (
+    HttpResponseForbidden,
+    HttpResponseRedirect,
+)
+from django.urls import reverse
 from django.utils.translation import gettext as _
 
 
@@ -15,3 +21,26 @@ def readonly_middleware(get_response):
         return get_response(request)
 
     return middleware
+
+
+def deprecated_auth_backend(get_response):
+    def middleware(request):
+        backend = request.session.get(BACKEND_SESSION_KEY)
+        if backend in settings.DEPRECATED_AUTHENTICATION_BACKENDS:
+            name = backend.split(".")[-1]
+            messages.error(
+                request,
+                _(
+                    "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."
+                )
+                % {"name": name},
+            )
+            if "/map/" in request.path:
+                return HttpResponseRedirect(reverse("user_profile"))
+
+        return get_response(request)
+
+    return middleware

umap/models.py

@@ -523,17 +523,27 @@ class DataLayer(NamedModel):
     def metadata(self, request=None):
         # Retrocompat: minimal settings for maps not saved after settings property
         # has been introduced
-        obj = self.settings or {
-            "name": self.name,
-            "displayOnLoad": self.display_on_load,
-        }
+        metadata = self.settings
+        if not metadata:
+            # Fallback to file for old datalayers.
+            data = json.loads(self.geojson.read().decode())
+            metadata = data.get("_umap_options")
+            if not metadata:
+                metadata = {
+                    "name": self.name,
+                    "displayOnLoad": self.display_on_load,
+                }
+            # Save it to prevent file reading at each map load.
+            self.settings = metadata
+            # Do not update the modified_at.
+            self.save(update_fields=["settings"])
         if self.old_id:
-            obj["old_id"] = self.old_id
-        obj["id"] = self.pk
-        obj["permissions"] = {"edit_status": self.edit_status}
-        obj["editMode"] = "advanced" if self.can_edit(request) else "disabled"
-        obj["_referenceVersion"] = self.reference_version
-        return obj
+            metadata["old_id"] = self.old_id
+        metadata["id"] = self.pk
+        metadata["permissions"] = {"edit_status": self.edit_status}
+        metadata["editMode"] = "advanced" if self.can_edit(request) else "disabled"
+        metadata["_referenceVersion"] = self.reference_version
+        return metadata
 
     def clone(self, map_inst=None):
         new = self.__class__.objects.get(pk=self.pk)

umap/settings/base.py

@@ -235,6 +235,7 @@ MIDDLEWARE = (
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
+    "umap.middleware.deprecated_auth_backend",
 )
 
 
@@ -274,7 +275,7 @@ UMAP_MAPS_PER_PAGE = 5
 UMAP_MAPS_PER_SEARCH = 25
 UMAP_MAPS_PER_PAGE_OWNER = 10
 UMAP_SEARCH_CONFIGURATION = "simple"
-UMAP_HELP_URL = "https://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help"
+UMAP_HELP_URL = "https://discover.umap-project.org/"
 USER_MAPS_URL = "user_maps"
 DATABASES = {
     "default": env.db(

umap/static/umap/base.css

@@ -19,7 +19,10 @@ h1, h2, h3, h4, h5, h6, label, hr {
 }
 a {
     text-decoration: none;
-    color: SeaGreen;
+    color: #1F5C39;
+}
+a[href^="http"]:not(nav.umap-nav a) {
+    text-decoration: underline;
 }
 button {
     cursor: pointer;

umap/static/umap/css/bar.css

@@ -201,3 +201,35 @@
 .umap-caption-bar-enabled {
     --current-footer-height: var(--footer-height);
 }
+.umap-edit-bar {
+    position: absolute;
+    right: var(--panel-gutter);
+    display: none;
+    top: calc(var(--current-header-height) + var(--panel-gutter));
+    flex-direction: column;
+    z-index: var(--zindex-panels);
+    width: var(--control-size);
+    background-color: var(--background-color);
+    border-radius: var(--border-radius);
+}
+.umap-edit-enabled .umap-edit-bar {
+    display: flex;
+}
+.umap-edit-bar li {
+    width: var(--control-size);
+    height: var(--control-size);
+}
+.umap-edit-bar button {
+    padding: 0;
+    border-radius: 0;
+}
+.umap-edit-bar li:first-of-type button {
+    border-radius: var(--border-radius) var(--border-radius) 0 0;
+}
+.umap-edit-bar li:last-of-type button {
+    border-radius: 0 0 var(--border-radius) var(--border-radius);
+}
+.umap-edit-bar hr {
+    padding: 0;
+    margin: 0;
+}

umap/static/umap/css/contextmenu.css

@@ -1,12 +1,20 @@
 .umap-contextmenu {
     background-color: var(--background-color);
-    padding: calc(var(--box-padding) / 2) var(--box-padding);
+    padding: calc(var(--box-padding) / 2) calc(var(--box-padding) / 2);
     position: fixed;
     z-index: var(--zindex-contextmenu);
     border-radius: var(--border-radius);
     box-shadow: var(--block-shadow);
+    display: flex;
+    flex-direction: column;
 }
-.umap-contextmenu li + li {
+.umap-contextmenu-rows {
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    align-content: center;
+}
+.umap-contextmenu:not(.umap-contextmenu-rows) li + li {
     margin-top: var(--text-margin);
 }
 
@@ -14,3 +22,7 @@
     margin-top: var(--text-margin);
     margin-bottom: var(--text-margin);
 }
+
+.dark.umap-contextmenu li button .icon:hover {
+    background-color: var(--color-mediumGray);
+}

umap/static/umap/css/form.css

@@ -87,6 +87,7 @@ input[type="submit"] {
     border: none;
     text-decoration: none;
     background-color: white;
+    justify-content: center;
 }
 .dark .button,
 .dark [type="button"] {
@@ -136,6 +137,9 @@ button.round {
     border-radius: 20px;
     border: 0.5px solid rgba(153, 153, 153, 0.40);
 }
+button.round.small {
+    padding: var(--button-padding-small);
+}
 .help-text, .helptext {
     display: block;
     padding: 7px 7px;
@@ -475,15 +479,6 @@ i.info {
 .umap-download:before {
     background-position: -72px -78px;
 }
-.permissions-panel,
-.umap-upload,
-.umap-share,
-.umap-datalayer-container,
-.umap-layer-properties-container,
-.umap-browse-data,
-.umap-tilelayer-switcher-container {
-    padding: 0 10px;
-}
 .umap-field-datalist {
     display: flex;
     justify-content: space-between;
@@ -614,6 +609,6 @@ input[type=hidden].blur + [type="button"] {
 input.highlightable:not(:placeholder-shown) {
     border: 1px solid var(--color-brightCyan);
 }
-.umap-upload [type=url] {
+.umap-import [type=url] {
     margin-bottom: 0;
 }