umap-project 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

umap/static/umap/locale/zh_TW.json

@@ -82,12 +82,10 @@
     "collapsed": "收起",
     "color": "色彩",
     "Comma separated list of numbers, including min and max values.": "用逗號分隔數字，包括最小與最大值。",
-    "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "逗號分隔屬性清單會用在方面搜尋 (例如：mykey,otherkey)。要控制標籤，則是之後新增 (例如：mykey|My Key,otherkey|Other Key)",
     "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "用逗號分隔屬性清單來排序圖徵。要保存排序，在槊面加上減號 (-1)，例如 mykey,-otherkey。",
     "Comma separated list of properties to use when filtering features": "以逗號分開列出篩選時要使用的屬性",
     "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "使用逗號、定位鍵或是分號分隔的地理數據。預設座標系為 SRS WGS84。只會匯入地理座標點。匯入時抓取 «lat» 與 «lon» 開頭的欄位資料，不分大小寫。其他欄位則歸入屬性資料。",
     "Congratulations, your map has been created!": "恭喜您的地圖已經新增完成",
-    "Continue line (Ctrl+Click)": "連續線（Ctrl+點擊鍵）",
     "Continue line": "連續線段",
     "Coordinates": "座標",
     "Copy link": "複製連結",
@@ -152,7 +150,6 @@
     "Dynamic properties": "動態屬性",
     "Dynamic": "動態",
     "Edit feature's layer": "編輯圖徵的圖層",
-    "Edit map properties": "編輯地圖屬性",
     "Edit properties in a table": "在表格中編輯屬性",
     "Edit the title of the map": "編輯地圖標題",
     "Edit this feature": "編輯此圖徵",
@@ -165,7 +162,6 @@
     "Equidistant": "等距",
     "Error in the overlay URL": "套疊網址錯誤",
     "Error in the tilelayer URL": "地圖磚圖層 URL 錯誤",
-    "Example: key1,key2,key3": "Example: key1,key2,key3",
     "Exit Fullscreen": "結束全螢幕模式",
     "expanded": "展開",
     "Extract shape to separate feature": "由外形分離出圖徵",
@@ -173,7 +169,6 @@
     "Facet search": "方面搜尋",
     "Feature identifier key": "Feature identifier key",
     "Feature properties": "圖徵屬性",
-    "Features in this layer: {count}": "這個圖層的圖徵數：{count}",
     "Fetch data each time map view changes.": "每次地圖檢視改變時截取資料。",
     "fill color": "填入色彩",
     "fill opacity": "填入不透明度",
@@ -334,8 +329,7 @@
     "Search": "搜尋",
     "Secret edit link copied to clipboard!": "複製私密編輯連結到剪貼簿！",
     "Secret edit link:": "祕密編輯連結：",
-    "See all": "觀看完整內容",
-    "See data layers": "檢視資料圖層",
+    "See layers": "See layers",
     "See full screen": "觀看全螢幕",
     "See on OpenStreetMap": "在開放街圖檢視",
     "Select data": "Select data",
@@ -365,7 +359,6 @@
     "stroke": "筆畫粗細",
     "Supported scheme": "支援的模板",
     "Supported variables that will be dynamically replaced": "支援的物件將直接動態轉換",
-    "Switch to edit mode": "切換至編輯模式",
     "Symbol": "符號",
     "Table": "表格",
     "Text color for the cluster label": "叢集標籤的文字顏色",
@@ -435,5 +428,24 @@
     "{distance} m": "{distance} 公尺",
     "{distance} miles": "{distance} 英哩",
     "{distance} NM": "{distance} 海浬",
-    "{distance} yd": "{distance} 英呎"
+    "{distance} yd": "{distance} 英呎",
+    "Edit map name and caption": "Edit map name and caption",
+    "Map advanced properties": "Map advanced properties",
+    "Edit map details": "Edit map details",
+    "Back to browser": "Back to browser",
+    "Toggle size": "Toggle size",
+    "Layers": "Layers",
+    "Display the caption control": "Display the caption control",
+    "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
+    "<empty value>": "<empty value>",
+    "Min": "Min",
+    "Max": "Max",
+    "From": "From",
+    "Until": "Until",
+    "Example: key1,key2|Label 2,key3|Label 3|checkbox": "Example: key1,key2|Label 2,key3|Label 3|checkbox",
+    "Edit in OpenStreetMap": "Edit in OpenStreetMap",
+    "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
+    "Back to layers": "Back to layers",
+    "Data": "Data",
+    "Filters": "Filters"
 }

umap/static/umap/map.css

@@ -32,13 +32,13 @@
 }
 .leaflet-control-fullscreen a:hover,
 .leaflet-control-fullscreen a {
-    height: 36px;
-    width: 36px;
+    height: var(--control-size);
+    width: var(--control-size);
     background-size: 36px 68px;
 }
 .leaflet-touch .leaflet-control-fullscreen a {
-    height: 36px;
-    width: 36px;
+    height: var(--control-size);
+    width: var(--control-size);
     background-position: 0px 0px;
 }
 .leaflet-touch.leaflet-fullscreen-on .leaflet-control-fullscreen a,
@@ -52,9 +52,9 @@
     background-position: 50% 50%;
     background-repeat: no-repeat;
     display: block;
-    height: 36px;
-    width: 36px;
-    line-height: 36px;
+    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;
@@ -144,8 +144,8 @@
     color: #fff;
     background-image: none;
     border-radius: 20px;
-    height: 36px;
-    line-height: 36px;
+    height: var(--control-size);
+    line-height: var(--control-size);
     display: block;
 }
 .leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover,
@@ -158,6 +158,12 @@
     margin-bottom: 5px!important;
     padding: 0.5rem;
 }
+.credits-container h5 {
+    margin-bottom: 5px;
+}
+.credits-container p {
+    margin-top: 5px;
+}
 .attribution-toggle {
     display: none;
     width: 24px;
@@ -287,14 +293,13 @@ ul.photon-autocomplete {
 .leaflet-control-toolbar > li > .leaflet-toolbar-icon,
 .umap-toolbar a,
 .umap-toolbar a:hover {
-    height: 40px;
-    width: 40px;
+    height: var(--control-size);
+    width: var(--control-size);
     display: none;
     margin-top: 0;
     vertical-align: top;
     border-bottom: none;
     background-color: var(--color-darkGray);
-    border-right: 1px solid #eee;
     background-repeat: no-repeat;
     background-image: url('./img/24.svg');
     background-size: auto auto;
@@ -316,59 +321,6 @@ ul.photon-autocomplete {
 .manage-datalayers {
     background-position: -36px -72px;
 }
-.permissions-panel h3:before,
-.umap-browse-datalayers h3:before,
-.umap-edit-container h3:before,
-.umap-feature-properties:before,
-.umap-layer-properties-container h3:before,
-.umap-search h3:before,
-.umap-share h3:before,
-.umap-tilelayer-switcher-container h3:before,
-.umap-upload h3:before {
-    height: 24px;
-    width: 24px;
-    background-repeat: no-repeat;
-    background-image: url('./img/16-white.svg');
-    background-size: auto auto;
-    background-position: -98px -117px;
-    content: " ";
-    vertical-align: bottom;
-    display: inline-block;
-}
-.umap-edit-container h3:before {
-    background-position: -27px -93px;
-}
-.permissions-panel h3:before {
-    background-position: -144px -117px;
-}
-.umap-upload h3:before {
-    background-position: -144px -93px;
-}
-.umap-search h3:before {
-    background-image: url('./img/16.svg');
-    background-position: -27px -117px;
-}
-.umap-share h3:before {
-    background-image: url('./img/16.svg');
-    background-position: -4px -119px;
-}
-.dark .umap-tilelayer-switcher-container h3:before {
-    background-image: url('./img/16-white.svg');
-    background-position: -98px -141px;
-}
-.umap-tilelayer-switcher-container h3:before {
-    background-image: url('./img/16.svg');
-    background-position: -98px -141px;
-}
-.umap-feature-properties.marker:before {
-    background-position: -72px -117px;
-}
-.umap-feature-properties.polyline:before {
-    background-position: 0 -117px;
-}
-.umap-feature-properties.polygon:before {
-    background-position: -24px -117px;
-}
 .umap-toolbar .update-map-permissions,
 .update-map-permissions {
     background-position: -36px -36px;
@@ -488,8 +440,8 @@ ul.photon-autocomplete {
     clear: both;
 }
 .umap-edit-actions li {
-    height: 36px;
-    line-height: 36px;
+    height: var(--control-size);
+    line-height: var(--control-size);
     cursor: pointer;
     margin-bottom: 5px;
     border-radius: 2px;
@@ -499,8 +451,8 @@ ul.photon-autocomplete {
     background-image: url('./img/24-white.svg');
     background-repeat: no-repeat;
     display: table-cell;
-    width: 36px;
-    height: 36px;
+    width: var(--control-size);
+    height: var(--control-size);
 }
 .umap-edit-actions li span {
     display: table-cell;
@@ -628,7 +580,7 @@ ul.photon-autocomplete {
     background-color: var(--color-darkGray);
     padding: 0 10px;
     text-align: left;
-    line-height: 36px;
+    line-height: var(--control-size);
     cursor: auto;
     border-bottom: 1px solid #222;
     z-index: 1000;
@@ -713,7 +665,7 @@ ul.photon-autocomplete {
     display: inline-block; /* Prevents underline on hover. */
 }
 .umap-edit-enabled .leaflet-top {
-    top: 48px;
+    top: 46px;
 }
 .umap-caption-bar-enabled .umap-caption-bar {
     display: block;
@@ -836,80 +788,15 @@ ul.photon-autocomplete {
 }
 
 
-
-/* ********************************* */
-/*   Datalayers Control              */
-/* ********************************* */
-
-.leaflet-control-browse .umap-browse-toggle {
-    background-image: url('./img/24.svg');
-    width: 36px;
-    height: 36px;
-    background-position: -36px -72px;
-    background-size: 180px;
-}
-.leaflet-control-browse .umap-browse-actions {
-    background-color: #fff;
-    padding: 10px;
-    display: none;
-    line-height: 24px;
-    border-radius: 2px;
-}
-.leaflet-control-browse .umap-browse-datalayers {
-    max-height: 15em;
-    overflow-y: auto;
-}
-.search-result-tools i,
-.leaflet-inplace-toolbar a,
-.umap-browse-features i,
-.umap-caption i,
-.umap-browse-datalayers i {
-    background-repeat: no-repeat;
-    background-image: url('./img/16.svg');
-    display: inline;
-    padding: 0 10px;
-    cursor: pointer;
-    height: 24px;
-    line-height: 24px;
-    vertical-align: middle;
-}
-.dark .umap-browse-datalayers i {
-    background-image: url('./img/16-white.svg');
-}
-.umap-browse-datalayers li[draggable] .drag-handle {
-    float: right;
-    background-position: -72px -72px;
-    margin-right: 5px;
-    cursor: move;
-}
-.leaflet-inplace-toolbar a {
-    background-image: url('./img/16-white.svg');
-    background-color: var(--color-darkGray)!important;
-}
 .leaflet-toolbar-tip {
     background-color: var(--color-darkGray);
 }
-.leaflet-inplace-toolbar a:hover {
-    background-color: #353c3e!important;
-}
-.leaflet-control-browse .umap-browse-datalayers .off i {
-    cursor: inherit;
-}
 .layer-toggle {
     background-position: -49px -31px;
 }
 .off .layer-toggle {
     background-position: -73px -31px;
 }
-.feature-zoom_to {
-    background-position: -1px -54px;
-}
-.layer-zoom_to {
-    background-position: -1px -54px;
-}
-.layer-table-edit {
-    background-position: -50px -1px;
-}
 .feature-delete,
 .layer-delete {
     background-position: -122px -49px;
@@ -921,17 +808,10 @@ ul.photon-autocomplete {
 .umap-toggle-edit {
     background-position: -44px -48px;
 }
-.readonly .layer-table-edit,
-.off .layer-table-edit {
-    background-position: -74px -1px;
-}
 .readonly .layer-edit,
 .off .layer-edit {
     background-position: -50px -73px;
 }
-.off .layer-zoom_to {
-    background-position: -25px -54px;
-}
 .readonly .layer-delete,
 .off .layer-delete {
     background-position: -122px -121px;
@@ -958,96 +838,108 @@ ul.photon-autocomplete {
 .umap-extract-shape-from-multi{
     background-position: -119px 2px;
 }
-.umap-browse-features .feature-title,
-.leaflet-control-browse .umap-browse-actions .layer-title {
+.umap-browser .feature-title {
     width: inherit;
     cursor: inherit;
     padding-left: 6px;
 }
-.umap-browse-features .feature-title {
+.umap-browser .feature-title {
     font-size: 12px;
     cursor: pointer;
 }
-.leaflet-control-browse .umap-browse-actions .off .layer-title {
-    color: rgb(179, 179, 179);
+.show-on-edit {
+    display: none!important;
 }
-.leaflet-control-browse.expanded > a,
-.leaflet-control-browse.expanded > button {
-    display: none;
+.umap-edit-enabled .show-on-edit {
+    display: inline-block!important;
 }
-.leaflet-control-browse.expanded .umap-browse-actions {
-    display: block;
+.umap-edit-enabled .show-on-edit.inline {
+    display: inline!important;
 }
-.leaflet-control-browse .umap-browse-link {
-    background-image: none;
-    background-color: rgb(68, 68, 68);
-    color: white;
-    display: block;
-    height: 24px;
-    line-height: 24px;
-    margin-top: 14px;
-    padding: 0 5px;
-    text-align: right;
-    min-width: 160px;
-    width: 100%;
-    border-radius: 2px;
+.umap-edit-enabled .show-on-edit.block {
+    display: block!important;
 }
-a.add-datalayer:before,
-.leaflet-control-browse .umap-browse-link:before {
-    background-image: url('./img/16.svg');
+.umap-edit-enabled .hide-on-edit {
+    display: none!important;
+}
+
+
+/* ********************************* */
+/*   Browser panel          */
+/* ********************************* */
+a.umap-control-browse,
+.umap-control-browse [type="button"] {
+    background-position: -36px -72px;
+}
+a.umap-control-caption,
+.umap-control-caption [type="button"] {
+    background-position: -72px -72px;
+}
+.leaflet-inplace-toolbar a {
     background-repeat: no-repeat;
-    background-position: -45px -96px;
-    width: 24px;
+    background-image: url('./img/16.svg');
+    display: inline;
+    padding: 0 10px;
+    cursor: pointer;
     height: 24px;
-    content: " ";
-    display: block;
-    float: left;
-}
-a.add-datalayer:before {
-    background-position: -20px -20px;
+    line-height: 24px;
+    vertical-align: middle;
 }
-a.add-datalayer:hover,
-.leaflet-control-browse .umap-browse-link:hover {
-    background-color: rgb(99, 99, 99);
+.umap-browser .datalayer i {
+    cursor: pointer;
 }
-.umap-browse-data .off .feature {
+.umap-browser ul {
     display: none;
 }
+.show-list ul {
+    display: block;
+}
 
-
-/* ********************************* */
-/*   Features browser panel          */
-/* ********************************* */
-
+.umap-browser .off .feature {
+    display: none;
+}
 .umap-facet-search .formbox,
-.umap-browse-features > div {
-    border: 1px solid #d3d3d3;
-    margin-bottom: 14px;
+.umap-browser .datalayer {
+    margin-bottom: 2px;
     border-radius: 2px;
 }
-.umap-browse-features h5, .umap-facet-search h5 {
+.umap-browser .datalayer ul {
+    border: 1px solid #d3d3d3;
+}
+.umap-browser.dark .datalayer ul {
+    border: 1px solid #232729;
+}
+.umap-browser h5, .umap-facet-search h5 {
     margin-bottom: 0;
     overflow: hidden;
     padding-left: 5px;
     height: 30px;
     line-height: 30px;
-    background-color: #eeeee0;
-    color: #666;
+    background-color: var(--color-lightGray);
+}
+.umap-browser .off h5 {
+    color: #b3b3b3;
 }
-.umap-browse-features h5 span {
+.umap-browser.dark h5 {
+    background-color: #232729;
+    color: white;
+}
+.umap-browser h5 span {
     margin-left: 10px;
 }
-.umap-browse-features li, .umap-facet-search li {
+.umap-browser li, .umap-facet-search li {
     padding: 2px 0;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.umap-facet-search li:nth-child(even),
-.umap-browse-features li:nth-child(even) {
-    background-color: #f8f8f3;
+.umap-browser .datalayer li:nth-child(even) {
+    background-color: #efefef;
+}
+.umap-browser.dark .datalayer li:nth-child(even) {
+    background-color: #2c3233;
 }
-.umap-browse-features .feature-color {
+.umap-browser .datalayer .feature-color {
     box-shadow: 0 0 2px 0 black inset;
     cursor: inherit;
     -moz-box-sizing:border-box;
@@ -1060,62 +952,50 @@ a.add-datalayer:hover,
     text-align: center;
     margin-left: 5px;
 }
-.umap-browse-features .feature-color img {
+.umap-browser.dark .datalayer .feature-color {
+    box-shadow: 0 0 2px 0 #999 inset;
+}
+.umap-browser .datalayer .feature-color img {
     width: 24px;
 }
-.umap-browse-features .feature-color span {
+.umap-browser .datalayer .feature-color span {
     font-style: normal;
     font-weight: bold;
 }
-.umap-browse-features .polygon .feature-color,
-.umap-browse-features .polyline .feature-color {
+.umap-browser .polygon .feature-color,
+.umap-browser .polyline .feature-color {
     box-shadow: 0 0 2px 0 black inset;
     background-image: url('./img/24.svg');
     background-size: 500%;
 }
-.umap-browse-features .polyline .feature-color {
+.umap-browser .polyline .feature-color {
     background-position: -72px -23px;
 }
-.umap-browse-features .polygon .feature-color {
+.umap-browser .polygon .feature-color {
     background-position: -48px -25px;
 }
-.show-on-edit {
-    display: none!important;
-}
-.umap-edit-enabled .show-on-edit {
-    display: inline-block!important;
+.umap-browser .datalayer-toggle-list {
+    float: right;
+    margin-right: 5px;
+    background-position: -145px -70px;
 }
-.umap-edit-enabled .show-on-edit.inline {
-    display: inline!important;
+.umap-browser .show-list .datalayer-toggle-list {
+    background-position: -145px -45px;
 }
-.umap-edit-enabled .show-on-edit.block {
-    display: block!important;
+.datalayer-name {
+    cursor: pointer;
 }
-.umap-browse-description {
-    font-size: 0.9em;
-    margin-bottom: 14px;
+.umap-caption h3 {
+    margin-bottom: 0;
 }
-.datalayer-counter {
-    float: right;
-    margin-right: 5px;
+.umap-caption .umap-map-owner {
+    padding-left: 31px;
 }
 
-
 /* ********************************* */
 /*          Table Editor             */
 /* ********************************* */
-#umap-ui-container.umap-table-editor {
-    padding-left: 0;
-    padding-right: 0;
-}
-#umap-ui-container.umap-table-editor .toolbox li {
-    float: left;
-}
 
-.umap-table-editor .umap-close-link {
-    right: auto;
-    left: 20px;
-}
 .umap-table-editor .table {
     display: table;
     width: 100%;
@@ -1170,33 +1050,6 @@ a.add-datalayer:hover,
 .umap-table-editor .thead .tcell:hover span {
     display: none;
 }
-.remotelayer .layer-table-edit {
-    display: none !important;
-}
-
-/* ********************************* */
-/*              Icons                */
-/* ********************************* */
-.umap-icon-16 {
-    background-repeat: no-repeat;
-    background-image: url('./img/16.svg');
-    display: inline-block;
-    height: 20px;
-    padding: 0 10px;
-    vertical-align: middle;
-}
-.umap-add {
-    background-position: -28px -27px;
-}
-.umap-list {
-    background-position: -28px -99px;
-}
-.umap-list-white {
-    background-position: -92px -168px;
-}
-.umap-caption {
-    background-position: -99px -28px;
-}
 
 /* ********************************* */
 /*      Tilelayer switcher           */
@@ -1659,9 +1512,9 @@ span.popup-icon {
 /* *************************** */
 
 .leaflet-control-zoom a, .leaflet-control-zoom a:hover {
-    height: 36px;
-    width: 36px;
-    line-height: 36px;
+    height: var(--control-size);
+    width: var(--control-size);
+    line-height: var(--control-size);
 }
 .leaflet-container .leaflet-control-zoom {
     margin-left: 10px;
@@ -1741,13 +1594,20 @@ span.popup-icon {
 .leaflet-inplace-toolbar {
   z-index: 10000!important;
 }
+.leaflet-inplace-toolbar a {
+    background-image: url('./img/16-white.svg');
+    background-color: var(--color-darkGray)!important;
+}
+.leaflet-inplace-toolbar a:hover {
+    background-color: #353c3e!important;
+}
 .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {
     border-width: 1px;
 }
 .leaflet-touch .leaflet-bar a {
-    width: 36px;
-    height: 36px;
-    line-height: 34px;
+    width: var(--control-size);
+    height: var(--control-size);
+    line-height: var(--control-size);
 }
 /* Links are blue by default  */
 .leaflet-container a {

umap/static/umap/test/DataLayer.js

@@ -126,7 +126,7 @@ describe('U.DataLayer', () => {
     })
 
     it('should have a new layer button', () => {
-      newLayerButton = qs('#umap-ui-container .add-datalayer')
+      newLayerButton = qs('.panel.right.on .add-datalayer')
       assert.ok(newLayerButton)
     })