umap-project 1.12.1__py3-none-any.whl → 1.13.0__py3-none-any.whl

umap/locale/zh_TW/LC_MESSAGES/django.po

@@ -8,16 +8,16 @@
 # coop.shen <coop.shen@gmail.com>, 2014
 # coop.shen <coop.shen@gmail.com>, 2014
 # Hsin-lin Cheng (lancetw) <lancetw@gmail.com>, 2014
-# Sean Young <assanges@icloud.com>, 2016,2018
+# Sean Young <assanges@icloud.com>, 2016,2018,2023
 # Supaplex <bejokeup@gmail.com>, 2014,2019
 # Yuan CHAO <yuanchao@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-22 16:21+0000\n"
+"POT-Creation-Date: 2024-01-08 12:33+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Supaplex <bejokeup@gmail.com>, 2019,2023\n"
+"Last-Translator: Sean Young <assanges@icloud.com>, 2016,2018,2023\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"
@@ -33,115 +33,115 @@ msgstr "僅能由私密連結編輯"
 msgid "Everyone can edit"
 msgstr "所有人皆可編輯"
 
-#: forms.py:69 models.py:317
+#: forms.py:69 models.py:349
 msgid "Inherit"
-msgstr ""
+msgstr "繼承"
 
-#: middleware.py:14
+#: middleware.py:13
 msgid "Site is readonly for maintenance"
 msgstr "網站目前因維護中設定為唯讀狀態"
 
-#: models.py:48
+#: models.py:49
 msgid "name"
 msgstr "名稱"
 
-#: models.py:79
+#: models.py:80
 msgid "details"
 msgstr "詳情"
 
-#: models.py:80
+#: models.py:81
 msgid "Link to a page where the licence is detailed."
 msgstr "連結至授權條款說明網址"
 
-#: models.py:90
+#: models.py:91
 msgid "URL template using OSM tile format"
 msgstr "URL 樣板，使用 OSM 地圖磚格式"
 
-#: models.py:96
+#: models.py:97
 msgid "Order of the tilelayers in the edit box"
 msgstr "編輯方塊中地圖磚的圖層順序"
 
-#: models.py:142 models.py:318
+#: models.py:143 models.py:350
 msgid "Everyone"
 msgstr "所有人"
 
-#: models.py:143 models.py:149 models.py:319
+#: models.py:144 models.py:150 models.py:351
 msgid "Editors only"
 msgstr "只有編輯者"
 
-#: models.py:144 models.py:320
+#: models.py:145 models.py:352
 msgid "Owner only"
 msgstr "只有擁有者"
 
-#: models.py:147
+#: models.py:148
 msgid "Everyone (public)"
 msgstr "所有人 (公開)"
 
-#: models.py:148
+#: models.py:149
 msgid "Anyone with link"
 msgstr "任何有連結的人"
 
-#: models.py:150
+#: models.py:151
 msgid "Blocked"
 msgstr "已經封銷了"
 
-#: models.py:153 models.py:324
+#: models.py:154 models.py:356
 msgid "description"
 msgstr "描述"
 
-#: models.py:154
+#: models.py:155
 msgid "center"
 msgstr "中心"
 
-#: models.py:155
+#: models.py:156
 msgid "zoom"
 msgstr "縮放"
 
-#: models.py:157
+#: models.py:158
 msgid "locate"
 msgstr "定位"
 
-#: models.py:157
+#: models.py:158
 msgid "Locate user on load?"
 msgstr "載入時使用定位功能？"
 
-#: models.py:161
+#: models.py:162
 msgid "Choose the map licence."
 msgstr "選擇地圖授權"
 
-#: models.py:162
+#: models.py:163
 msgid "licence"
 msgstr "授權"
 
-#: models.py:172
+#: models.py:174
 msgid "owner"
 msgstr "擁有者"
 
-#: models.py:176
+#: models.py:178
 msgid "editors"
 msgstr "編輯者"
 
-#: models.py:181 models.py:338
+#: models.py:183 models.py:370
 msgid "edit status"
 msgstr "編輯狀態"
 
-#: models.py:186
+#: models.py:188
 msgid "share status"
 msgstr "分享狀態"
 
-#: models.py:189 models.py:333
+#: models.py:191 models.py:365
 msgid "settings"
 msgstr "設定"
 
-#: models.py:268
+#: models.py:298
 msgid "Clone of"
 msgstr "複製"
 
-#: models.py:328
+#: models.py:360
 msgid "display on load"
 msgstr "載入時顯示"
 
-#: models.py:329
+#: models.py:361
 msgid "Display this layer on load."
 msgstr "載入此圖層時顯示"
 
@@ -298,50 +298,78 @@ msgstr "找點子，瀏覽其他地圖"
 msgid "You are logged in. Continuing..."
 msgstr "您已登入，繼續中..."
 
-#: templates/umap/map_list.html:9 views.py:303
+#: templates/umap/map_list.html:9 views.py:296
 msgid "by"
 msgstr "由"
 
-#: templates/umap/map_list.html:17 templates/umap/map_table.html:39
+#: templates/umap/map_list.html:17
 msgid "More"
 msgstr "更多"
 
-#: templates/umap/map_table.html:6
-msgid "Map"
-msgstr "地圖"
-
-#: templates/umap/map_table.html:7
+#: templates/umap/map_table.html:5
 msgid "Name"
 msgstr "名稱"
 
-#: templates/umap/map_table.html:8
+#: templates/umap/map_table.html:6
+msgid "Preview"
+msgstr ""
+
+#: templates/umap/map_table.html:7
 msgid "Who can see / edit"
 msgstr "誰可以檢視 / 編輯"
 
-#: templates/umap/map_table.html:9
+#: templates/umap/map_table.html:8
 msgid "Last save"
 msgstr "最後儲存"
 
-#: templates/umap/map_table.html:10
+#: templates/umap/map_table.html:9
 msgid "Owner"
 msgstr "擁有者"
 
-#: templates/umap/map_table.html:11
+#: templates/umap/map_table.html:10
 msgid "Actions"
 msgstr "動作"
 
-#: templates/umap/map_table.html:28
+#: templates/umap/map_table.html:22
+msgid "Open preview"
+msgstr ""
+
+#: templates/umap/map_table.html:38
 msgid "Share"
 msgstr "分享"
 
-#: templates/umap/map_table.html:29
+#: templates/umap/map_table.html:39
 msgid "Edit"
 msgstr "編輯"
 
-#: templates/umap/map_table.html:30
+#: templates/umap/map_table.html:40
 msgid "Download"
 msgstr "下載"
 
+#: templates/umap/map_table.html:49
+msgid "first"
+msgstr ""
+
+#: templates/umap/map_table.html:50
+msgid "previous"
+msgstr ""
+
+#: templates/umap/map_table.html:59
+#, python-format
+msgid ""
+"\n"
+"      Page %(maps_number)s of %(num_pages)s\n"
+"    "
+msgstr ""
+
+#: templates/umap/map_table.html:65
+msgid "next"
+msgstr ""
+
+#: templates/umap/map_table.html:66
+msgid "last"
+msgstr ""
+
 #: templates/umap/navigation.html:15
 msgid "Starred maps"
 msgstr "打心號的地圖"
@@ -438,52 +466,52 @@ msgstr "我的個人檔案"
 msgid "You have no map yet."
 msgstr "你目前還沒有地圖。"
 
-#: views.py:308
+#: views.py:301
 msgid "View the map"
 msgstr "檢視地圖"
 
-#: views.py:658
+#: views.py:660
 msgid "Map has been updated!"
 msgstr "地圖已經更新"
 
-#: views.py:683
+#: views.py:685
 msgid "Map editors updated with success!"
 msgstr "地圖編輯者更新完成"
 
-#: views.py:721
+#: views.py:723
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "你的地圖 uMap 編輯連結：%(map_name)s"
 
-#: views.py:724
+#: views.py:726
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "這是你的祕密編輯連結：%(link)s"
 
-#: views.py:730
+#: views.py:732
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "電子郵件寄至 %(email)s"
 
-#: views.py:741
+#: views.py:743
 msgid "Only its owner can delete the map."
 msgstr "只有擁有者可以刪除此地圖"
 
-#: views.py:764
+#: views.py:766
 #, 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:769
+#: views.py:771
 msgid "Congratulations, your map has been cloned!"
 msgstr "恭喜，您的地圖已被複製！"
 
-#: views.py:958
+#: views.py:1007
 msgid "Layer successfully deleted."
 msgstr "圖層已刪除"
 
-#: views.py:980
+#: views.py:1029
 msgid "Permissions updated with success!"
-msgstr ""
+msgstr "權限更新完成"

umap/models.py

@@ -11,6 +11,7 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from .managers import PublicManager
+from .utils import _urls_for_js
 
 
 # Did not find a clean way to do this in Django
@@ -193,6 +194,34 @@ class Map(NamedModel):
     objects = models.Manager()
     public = PublicManager()
 
+    @property
+    def preview_settings(self):
+        layers = self.datalayer_set.all()
+        datalayer_data = [c.metadata() for c in layers]
+        map_settings = self.settings
+        if "properties" not in map_settings:
+            map_settings["properties"] = {}
+        map_settings["properties"].update(
+            {
+                "tilelayers": [TileLayer.get_default().json],
+                "datalayers": datalayer_data,
+                "urls": _urls_for_js(),
+                "STATIC_URL": settings.STATIC_URL,
+                "editMode": "disabled",
+                "hash": False,
+                "attributionControl": False,
+                "scrollWheelZoom": False,
+                "umapAttributionControl": False,
+                "noControl": True,
+                "umap_id": self.pk,
+                "onLoadPanel": "none",
+                "captionBar": False,
+                "default_iconUrl": "%sumap/img/marker.png" % settings.STATIC_URL,
+                "slideshow": {},
+            }
+        )
+        return map_settings
+
     def get_absolute_url(self):
         return reverse("map", kwargs={"slug": self.slug or "map", "map_id": self.pk})
 

umap/static/umap/base.css

@@ -162,13 +162,15 @@ textarea {
     padding: 7px;
 }
 select {
+    border: 1px solid #222;
     width: 100%;
     height: 28px;
     line-height: 28px;
+    margin-top: 5px;
+}
+.dark select {
     color: #efefef;
-    border: 1px solid #222;
     background-color: #393F3F;
-    margin-top: 5px;
 }
 select[multiple="multiple"] {
     height: auto;
@@ -294,16 +296,19 @@ input[type="file"] + .error {
     text-align: left;
     display: block;
     cursor: pointer;
-    background-color: #232729;
+    background-color: #eee;
     height: 30px;
     line-height: 30px;
-    color: #fff;
     margin: 0;
     font-family: fira_sans;
     font-weight: normal;
     font-size: 1.2em;
     padding: 0 5px;
 }
+.dark .fieldset.toggle .legend {
+    background-color: #232729;
+    color: #fff;
+}
 .fieldset.toggle .legend:before {
     background-repeat: no-repeat;
     text-indent: 24px;
@@ -311,11 +316,14 @@ input[type="file"] + .error {
     width: 24px;
     line-height: 24px;
     display: inline-block;
-    background-image: url('./img/16-white.svg');
+    background-image: url('./img/16.svg');
     vertical-align: bottom;
     content: " ";
     background-position: -144px -76px;
 }
+.dark .fieldset.toggle .legend:before {
+    background-image: url('./img/16-white.svg');
+}
 .fieldset.toggle.on .legend:before {
     background-position: -144px -51px;
 }
@@ -584,6 +592,8 @@ i.info {
     text-align: center;
     margin-bottom: 5px;
     display: block;
+    color: black;
+    font-weight: bold;
 }
 .umap-pictogram-choice img {
     vertical-align: middle;
@@ -643,6 +653,24 @@ input[type=hidden].blur + .button,
 input[type=hidden].blur + [type="button"] {
     display: none;
 }
+.copiable-input {
+    display: flex;
+    align-items: end;
+}
+.copiable-input input {
+    border-radius: initial;
+}
+.copiable-input button {
+    background-repeat: no-repeat;
+    background-image: url('./img/16.svg');
+    background-position: -45px -140px;
+    display: inline;
+    padding: 0 10px;
+    height: 32px;
+    width: 32px;
+    border: 1px solid #202425;
+    border-radius: initial;
+}
 
 /* *********** */
 /*    Panel    */

umap/static/umap/content.css

@@ -134,6 +134,9 @@ h2.section {
     padding-top: 28px;
 }
 h2.tabs a {
+    color: #666;
+}
+h2.tabs a:not(.selected) {
     font-weight: normal;
     color: #666;
 }
@@ -296,9 +299,9 @@ table.maps {
     width: 100%;
 }
 table.maps .map_fragment {
-    height: 100px;
+    display: block;
+    height: 80vh;
     width: 100%;
-    min-width: 200px;
 }
 table.maps tbody tr:nth-child(odd) {
     background-color: #f4f4f4;
@@ -309,6 +312,42 @@ table.maps td {
 table.maps thead tr {
     line-height: 2em;
 }
+table.maps .button {
+    margin-bottom: 2px;
+    padding:4px 6px;
+    height: 36px;
+    line-height: 23px;
+}
+
+/* **************************** */
+/*           Dialog             */
+/* **************************** */
+dialog {
+    width: 90vw;
+    height: 90vh;
+}
+dialog::backdrop {
+    background: #fff5;
+    backdrop-filter: blur(4px);
+}
+.close-dialog {
+    text-align: center;
+    margin-bottom: 0;
+}
+
+/* ********************************* */
+/*         Pagination                */
+/* ********************************* */
+.pagination {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    margin: 1rem;
+    border-top: 1px solid gray;
+}
+.pagination > * {
+    padding: 1rem;
+}
 
 
 /* ************************************************* */

umap/static/umap/img/16.svg

@@ -1,5 +1,8 @@
-<svg id="svg2" width="144" height="168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg id="svg2" width="168" height="168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <defs id="defs4">
+  <marker id="Arrow1" overflow="visible" markerHeight="6.7071066" markerWidth="4.0606604" orient="auto-start-reverse" preserveAspectRatio="xMidYMid" viewBox="0 0 4.0606602 6.7071068">
+   <path id="path5057" transform="rotate(180 .125 0)" d="m3-3-3 3 3 3" fill="none" stroke="context-stroke"/>
+  </marker>
   <mask id="mask0_181_11898" x="2" y="2" width="15" height="15" maskUnits="userSpaceOnUse">
    <path id="path2351" d="m16.04 2.3158h-14.035v14.035h14.035z" fill="#fff"/>
   </mask>
@@ -13,7 +16,6 @@
   </rdf:RDF>
  </metadata>
  <g id="layer1" transform="translate(0 -812.36)">
-  <text id="text4457" x="5.7867966" y="897.80786" fill="#000000" font-family="sans-serif" letter-spacing="0px" word-spacing="0px" style="line-height:0%" xml:space="preserve"><tspan id="tspan4459" x="5.7867966" y="897.80786" font-family="sans-serif" font-size="40px" style="line-height:1.25"> </tspan></text>
   <g id="help" transform="translate(-23.256 -119.39)">
    <circle id="path3014" transform="matrix(1.0714 0 0 1.0714 26.684 934.11)" cx="8" cy="9" r="7" fill="none" stroke="#4d4d4d" stroke-width=".93333"/>
    <g id="text3784" transform="translate(27.256 -100.61)" fill="#4d4d4d">
@@ -168,5 +170,13 @@
    </g>
    <path id="path2378" d="m25.147 1.8521h-4.2439c-0.07035 0-0.13782 0.027946-0.18756 0.077689-0.04974 0.049744-0.07769 0.11721-0.07769 0.18756v4.2439c0 0.070353 0.02795 0.13782 0.07769 0.18756 0.04974 0.049742 0.11721 0.077682 0.18756 0.077682h4.2439c0.07035 0 0.13782-0.02794 0.18756-0.077682 0.04974-0.049742 0.07768-0.11721 0.07768-0.18756v-4.2439c0-0.070349-0.02794-0.13782-0.07768-0.18756-0.04974-0.049743-0.11721-0.077689-0.18756-0.077689zm-0.26524 4.1591h-3.7135v-3.5463h3.7135z" fill="#464646" stroke-width=".26458"/>
   </g>
+  <path id="arrow-down" d="m156 875.36 6-6h-12z" fill="#4d4d4d" fill-rule="evenodd"/>
+  <path id="arrow-right" d="m159 896.36-6-6v12z" fill="#4d4d4d" fill-rule="evenodd"/>
+  <path id="downloadfile" d="m14.182 962.12v2.6078h2.6078zm2.9091 4.0624h-2.9091c-0.80332 0-1.4545-0.65122-1.4545-1.4545v-2.9091h-5.8182v13.091h10.182zm-10.182-5.8182h7.574l4.0624 4.0624v10.483c0 0.80333-0.65122 1.4546-1.4545 1.4546h-10.182c-0.80332 0-1.4545-0.65122-1.4545-1.4546v-13.091c0-0.80333 0.65122-1.4546 1.4545-1.4546zm4.3636 9.8806v-3.3351h1.4545v3.3351l0.94028-0.94029 1.0285 1.0285-2.6961 2.6961-2.6961-2.6961 1.0285-1.0285z" fill="#464646" fill-rule="evenodd" stroke-width=".72727"/>
+  <g id="downloadbackup">
+   <path id="path8303-6" d="m42.545 974.91c0 0.80333-0.65122 1.4546-1.4545 1.4546h-10.182c-0.80332 0-1.4545-0.65122-1.4545-1.4546h13.091z" fill="#464646" stroke-width=".72727"/>
+   <path id="path16669" d="m36 963.88v8.3163" fill="none" marker-end="url(#Arrow1)" stroke="#464646" stroke-width="1.5"/>
+  </g>
+  <path id="copy" d="m58.25 962.61v3.5h4v4h3.5v-7.5zm-4 4v7.5h7.5v-7.5z" fill="#4d4d4d" style="paint-order:fill markers stroke"/>
  </g>
 </svg>