umap-project 3.2.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

umap/static/umap/locale/zh_TW.json

@@ -57,7 +57,6 @@
     "Click last point to finish shape": "點下最後一點後完成外形",
     "Click to add a marker": "點選以新增標記",
     "Click to continue drawing": "點擊以繼續繪製",
-    "Click to edit": "點擊開始編輯",
     "Click to start drawing a line": "點擊以開始繪製直線",
     "Click to start drawing a polygon": "點選開始繪製多邊形",
     "Clone of {name}": "複製 {name}",
@@ -209,7 +208,6 @@
     "Link with text: [[https://example.com|text of the link]]": "有文字的連結：[[https://example.com|text of the link]]",
     "Long credits": "詳細工作人員名單",
     "Longitude": "經度",
-    "Make main shape": "設為主要外形",
     "Manage layers": "管理圖層",
     "Manual": "手動",
     "Map background credits": "地圖背景取自",
@@ -285,7 +283,6 @@
     "Quantiles": "數量",
     "Recent": "目前",
     "Remote data": "遠端資料",
-    "Remove shape from the multi": "移除外形",
     "Replace layer content": "取代圖層內容",
     "Restore this version": "回復此版本",
     "Save current edits": "儲存近期的變更",
@@ -521,64 +518,102 @@
     "Edit map default view": "編輯地圖預設檢視",
     "Use current center and zoom": "使用目前中心與縮放大小",
     "Layer permalink": "圖層永久連結",
-    "Back to home": "Back to home",
-    "Home logo": "Home logo",
-    "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": "Cancel last edit",
-    "Redo last edit": "Redo last edit",
-    "Links": "Links",
-    "Images": "Images",
-    "Iframes": "Iframes",
-    "Tags": "Tags",
-    "Geocode": "Geocode",
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes.",
-    "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",
-    "Add text along path": "Add text along path",
-    "Text color": "Text color",
-    "Text offset": "Text offset",
-    "Text position": "Text position",
-    "start": "start",
-    "center": "center",
-    "end": "end",
-    "Text repeat": "Text repeat",
-    "Text rotate": "Text rotate",
-    "Text size": "Text size",
-    "Load map template": "Load map template",
-    "My templates": "My templates",
-    "From staff": "From staff",
-    "From community": "From community",
-    "You must select a template.": "You must select a template.",
-    "Line decoration": "Line decoration",
-    "Reuse this template": "Reuse this template",
-    "Create a new map using this template": "Create a new map using this template",
-    "Save template": "Save template",
-    "Load template": "Load template",
-    "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",
-    "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.",
-    "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"
+    "Back to home": "回到首頁",
+    "Home logo": "首頁 logo",
+    "Add this geometry to my map": "新增此一幾何到我的地圖",
+    "Add this place to my map": "新增這一地點到我的地圖",
+    "Cancel last edit": "取消最後編輯",
+    "Redo last edit": "重覆最後編輯",
+    "Links": "連結",
+    "Images": "影像",
+    "Iframes": "內崁頁面",
+    "Tags": "標籤",
+    "Geocode": "地理代碼",
+    "Display the back to home icon": "顯示回到首頁圖示",
+    "Do you want to display layer switcher in caption bar?": "你想要標題列顯示圖層切換嗎？",
+    "Simplify all geometries to points": "簡化所有幾何圖形變成節點",
+    "Back to list": "回到清單",
+    "Toggle rule": "套用規則",
+    "Delete rule": "刪除規則",
+    "Cannot save layer, please try again in a few minutes.": "無法儲存圖層，請幾分鐘之後再試一次。",
+    "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.": "在這一份地圖啟用共同即時編輯，其他使用者必須在啟用這項設定後重新載入地圖。",
+    "More help resources": "更多幫助資源",
+    "This map is a template": "這份地圖是模版",
+    "Add text along path": "延著路徑新增文字",
+    "Text color": "文字顏色",
+    "Text offset": "文字偏移",
+    "Text position": "文字位置",
+    "start": "開始",
+    "center": "中間",
+    "end": "結尾",
+    "Text repeat": "文字重覆",
+    "Text rotate": "文字旋轉",
+    "Text size": "文字大小",
+    "Load map template": "載入地圖模版",
+    "My templates": "我的模版",
+    "From staff": "從職員",
+    "From community": "從社群",
+    "You must select a template.": "你必須選擇模版。",
+    "Line decoration": "線段修飾",
+    "Reuse this template": "重覆使用這份模版",
+    "Create a new map using this template": "使用這份模版新增地圖",
+    "Save template": "儲存模版",
+    "Load template": "載入模版",
+    "Loading a template will apply predefined styles and settings to your map": "載入模版將會套用預先定義的樣式與設定到你的地圖上",
+    "Load template with data": "連同資料載入模版",
+    "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.": "仍沒有建議模版，建議模版為uMap管理員打星號的模版。",
+    "There is no public template yet.": "仍沒有公開模版。",
+    "Explore": "瀏覽",
+    "Import data from public open data portals": "從公共開放資料平台匯入資料",
+    "Choose a portal": "選擇平台",
+    "Limit results to current map view": "限制結果為目前地圖檢視",
+    "Please choose an instance first.": "請先選擇站臺。",
+    "No geo column found: must be either `lat(itude)` and `lon(gitude)` or `geom(etry)`.": "沒有找到地理欄位：必須是`lat(itude)`與 `lon(gitude)` 或者 `geom(etry)`。",
+    "Add a new field": "新增欄位",
+    "Are you sure you want to delete this field on all the features?": "你確定要從所有圖徵刪除這個欄位？",
+    "Please enter the new name of this field": "請新增這個欄位的新名稱",
+    "Cannot process MultiPoint": "無法處理多重點",
+    "Manage Fields": "管理欄位",
+    "Rename this field": "重新命名這一欄位",
+    "Delete this field": "刪除這一欄位",
+    "Double click to edit the name": "按兩下來編輯名稱",
+    "Print map": "列印地圖",
+    "Choose a format": "選擇格式",
+    "Scale map": "地圖尺度",
+    "portrait": "直式",
+    "landscape": "橫式",
+    "Print": "列印",
+    "Preparing the print…": "準備列印…",
+    "Large Circle": "大型圓圈",
+    "Icon size": "圖示大小",
+    "Will only affect raw and large circle icons.": "只會影響原始與大型圓圈圖示。",
+    "Route": "路線",
+    "Display the print control": "顯示點控制",
+    "Compute isochrone from here": "從這裡計算等時圖",
+    "Route settings": "路線設定",
+    "Transform to regular line": "轉換為普通線條",
+    "Transform to route": "轉換為路線",
+    "Restore route": "恢復路線",
+    "Compute elevation": "計畫等高線",
+    "Profile": "設定檔案",
+    "Compute elevations": "計算等高線。",
+    "Route preference": "路線偏好設定",
+    "Compute route": "計算路線",
+    "Walking": "步行",
+    "Hiking": "登山",
+    "By car": "開車",
+    "Cycling": "騎單車",
+    "Wheelchair": "輪椅",
+    "Recommended": "建議",
+    "Fastest": "最快",
+    "Shortest": "最短",
+    "Max time (in minutes)": "最大時間 (分鐘)",
+    "Number of lines": "線條數量",
+    "Distance:": "距離：",
+    "Gain:": "增加：",
+    "Loss:": "減少：",
+    "Altitude:": "海拔：",
+    "Right-click to edit": "按右鍵來編輯",
+    "Draw along routes": "沿著路線繪製"
 }

umap/static/umap/map.css

@@ -42,6 +42,31 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
     background-color: var(--color-lightGray);
 }
 
+.print-portrait,
+.print-landscape {
+    left: initial !important;
+    right: initial !important;
+    top: initial !important;
+    bottom: initial !important;
+    height: initial !important;
+}
+
+.print-a4.print-landscape {
+    aspect-ratio: 297/210;
+}
+
+.print-a4.print-portrait {
+    aspect-ratio: 210/297;
+}
+
+.print-usletter.print-landscape {
+    aspect-ratio: 11/8.5;
+}
+
+.print-usletter.print-portrait {
+    aspect-ratio: 8.5/11;
+}
+
 /* *********** */
 /* Structure   */
 /* *********** */
@@ -96,17 +121,21 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
 .leaflet-control-locate a,
 .umap-control a,
 .umap-control [type="button"] {
-    background-position: 50% 50%;
-    background-repeat: no-repeat;
     display: block;
     height: var(--control-size);
     width: var(--control-size);
     line-height: var(--control-size);
-    background-image: url('./img/24.svg');
-    text-indent: -9999px;
     margin-bottom: 0;
     background-color: white;
     min-height: initial;
+    padding: 0;
+}
+
+.leaflet-measure-control a,
+.leaflet-control-locate a {
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    background-image: url('./img/24.svg');
 }
 
 .leaflet-control.display-on-more {
@@ -595,15 +624,6 @@ ul.photon-autocomplete {
 /* ********************************* */
 /*   Browser panel          */
 /* ********************************* */
-a.umap-control-browse,
-.umap-control-browse [type="button"] {
-    background-position: -144px -180px;
-}
-
-a.umap-control-caption,
-.umap-control-caption [type="button"] {
-    background-position: -144px -36px;
-}
 
 .leaflet-inplace-toolbar a {
     background-repeat: no-repeat;
@@ -844,15 +864,21 @@ a.umap-control-caption,
 .rules-caption .color-box {
     width: 24px;
     height: 24px;
+    line-height: 24px;
     display: inline-block;
     margin-right: var(--text-margin);
     vertical-align: middle;
+    text-align: center;
+}
+
+.rules-caption .color-box img {
+    vertical-align: middle;
 }
 
 /* ************* */
 /* Marker's Icon */
 /* ************* */
-.umap-div-icon .icon_container {
+.umap-div-icon .icon-container {
     background-color: white;
     border-radius: 4px 4px 4px 4px;
     height: 32px;
@@ -864,7 +890,7 @@ a.umap-control-caption,
     line-height: 32px;
 }
 
-.umap-div-icon.umap-icon-active .icon_container {
+.umap-div-icon.umap-icon-active .icon-container {
     border-radius: 5px;
     box-shadow: 7px 10px 10px -1px black;
     height: 36px;
@@ -875,14 +901,14 @@ a.umap-control-caption,
     width: 36px;
 }
 
-.umap-div-icon .icon_container img {
+.umap-div-icon .icon-container img {
     vertical-align: middle;
     max-width: 24px !important;
     /* leaflet.css has !important, so... */
     max-height: 24px !important;
 }
 
-.umap-div-icon .icon_arrow {
+.umap-div-icon .icon-arrow {
     border-left: 8px solid transparent;
     border-right: 8px solid transparent;
     border-top: 8px solid #2270b5;
@@ -893,11 +919,11 @@ a.umap-control-caption,
     opacity: 0.9;
 }
 
-.umap-div-icon.umap-icon-active .icon_arrow {
+.umap-div-icon.umap-icon-active .icon-arrow {
     opacity: 1.0 !important;
 }
 
-.umap-drop-icon .icon_arrow {
+.umap-drop-icon .icon-arrow {
     border-left: 10px solid transparent;
     border-right: 10px solid transparent;
     border-top: 16px solid #2270B5;
@@ -908,7 +934,7 @@ a.umap-control-caption,
     width: 0;
 }
 
-.umap-drop-icon.umap-icon-active .icon_arrow {
+.umap-drop-icon.umap-icon-active .icon-arrow {
     border-left-width: 12px;
     border-right-width: 12px;
     border-top-width: 18px;
@@ -916,7 +942,7 @@ a.umap-control-caption,
     opacity: 1.0 !important;
 }
 
-.umap-drop-icon .icon_container {
+.umap-drop-icon .icon-container {
     background-color: #2470B5;
     border-radius: 16px 16px 16px 16px;
     box-shadow: 6px 13px 8px -4px black;
@@ -927,7 +953,7 @@ a.umap-control-caption,
     width: 32px;
 }
 
-.umap-drop-icon.umap-icon-active .icon_container {
+.umap-drop-icon.umap-icon-active .icon-container {
     box-shadow: 4px 11px 10px -2px black;
     border-radius: 18px 18px 18px 18px;
     height: 36px;
@@ -938,36 +964,48 @@ a.umap-control-caption,
     width: 36px;
 }
 
-.umap-drop-icon .icon_container img {
+.umap-drop-icon .icon-container img {
     vertical-align: middle;
     max-width: 24px !important;
     max-height: 24px !important;
 }
 
-.umap-div-icon .icon_container span,
-.umap-drop-icon .icon_container span {
+.umap-div-icon .icon-container span,
+.umap-drop-icon .icon-container span {
     vertical-align: middle;
     font-weight: bold;
 }
 
 .umap-circle-icon {
-    border: 1px solid white;
-    border-radius: 10px 10px 10px 10px;
-    margin-inline-start: -6px;
-    margin-top: -6px;
+    border: 2px solid white;
+    border-radius: 50%;
     height: 12px;
     width: 12px;
 }
 
 .umap-circle-icon.umap-icon-active {
-    height: 16px;
-    margin-inline-start: -8px;
-    margin-top: -8px;
     opacity: 1.0 !important;
+    height: 16px;
     width: 16px;
 }
 
-.umap-ball-icon .icon_container {
+.umap-large-circle-icon {
+    border: 2px solid white;
+    background-color: white;
+    border-radius: 50%;
+    height: 36px;
+    width: 36px;
+    box-shadow: black 0px 0px 1px;
+    display: flex;
+    align-content: center;
+}
+
+.umap-large-circle-icon.umap-icon-active {
+    opacity: 1.0 !important;
+    box-shadow: var(--block-shadow);
+}
+
+.umap-ball-icon .icon-container {
     background-color: darkblue;
     background: radial-gradient(circle at 6px 38%, white -4px, darkblue 8px) repeat scroll 0 0 transparent;
     border-radius: 8px 8px 8px 8px;
@@ -978,7 +1016,7 @@ a.umap-control-caption,
     width: 16px;
 }
 
-.umap-ball-icon.umap-icon-active .icon_container {
+.umap-ball-icon.umap-icon-active .icon-container {
     border-radius: 10px 10px 10px 10px;
     box-shadow: 1px 23px 7px -1px black;
     margin-inline-start: -2px;
@@ -988,7 +1026,7 @@ a.umap-control-caption,
     width: 20px;
 }
 
-.umap-ball-icon .icon_arrow {
+.umap-ball-icon .icon-arrow {
     background-color: black;
     height: 16px;
     inset-inline-start: 7px;
@@ -1006,24 +1044,35 @@ a.umap-control-caption,
     cursor: not-allowed;
 }
 
-.leaflet-container .umap-raw-icon img {
-    max-height: 48px !important;
-    max-width: 48px !important;
-}
-
 .umap-raw-icon {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: center;
     align-content: center;
     overflow: hidden;
 }
 
+.umap-raw-icon img {
+    object-fit: contain;
+}
+
 .umap-raw-icon.umap-icon-active {
     box-shadow: var(--block-shadow);
 }
 
+.umap-cluster-icon {
+    border-radius: 50%;
+    border: 4px solid white;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+}
+
+.leaflet-overlay-pane > svg {
+    z-index: var(--zindex-orphan-marker);
+}
+
 /* ********************************* */
 /*         Ajax loader               */
 /* ********************************* */

umap/static/umap/vars.css

@@ -61,6 +61,7 @@
     --zindex-panels: 440;
     --zindex-controls: 430;
     --zindex-dragover: 410;
+    --zindex-orphan-marker: 401;
 
     --block-shadow: 0 1px 7px var(--color-mediumGray);
 }

umap/static/umap/vendors/editable/Leaflet.Editable.js

@@ -814,6 +814,8 @@
   // 🍂namespace Editable; 🍂class BaseEditor; 🍂aka L.Editable.BaseEditor
   // When editing a feature (Marker, Polyline…), an editor is attached to it. This
   // editor basically knows how to handle the edition.
+  // 🍂option draggable: boolean = false
+  // Disable dragging of the feature while in edit mode
   L.Editable.BaseEditor = L.Handler.extend({
     initialize: function (map, feature, options) {
       L.setOptions(this, options)
@@ -854,7 +856,7 @@
 
     onFeatureAdd: function () {
       this.tools.editLayer.addLayer(this.editLayer)
-      if (this.feature.dragging) this.feature.dragging.enable()
+      if (this.feature.dragging && this.options.draggable != false) this.feature.dragging.enable()
     },
 
     hasMiddleMarkers: function () {