umap-project 2.7.3__py3-none-any.whl → 2.8.0a0__py3-none-any.whl

umap/static/umap/locale/zh_TW.json

@@ -1,6 +1,6 @@
 {
-    "(area: {measure})": "(area: {measure})",
-    "(length: {measure})": "(length: {measure})",
+    "(area: {measure})": "(面積：{measure})",
+    "(length: {measure})": "(長度：{measure})",
     "# one hash for main heading": "單個 # 代表主標題",
     "## two hashes for second heading": "兩個 # 代表次標題",
     "### three hashes for third heading": "三個 # 代表第三標題",
@@ -183,12 +183,12 @@
     "Icon shape": "圖示圖形",
     "Icon symbol": "圖示標誌",
     "If false, the polygon or line will act as a part of the underlying map.": "選擇「否」時，多邊形物件會被當成為底圖的一部分。",
-    "Iframe with custom height (in px): {{{http://iframe.url.com|height}}}": "自訂 iframe 高度 (以 px 為單位): {{{http://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{http://iframe.url.com|height*width}}}": "自訂 iframe 高度和寬度 (以 px 為單位)：{{{http://iframe.url.com|height*width}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
     "iframe": "iframe",
-    "Iframe: {{{http://iframe.url.com}}}": "Iframe: {{{http://iframe.url.com}}}",
-    "Image with custom width (in px): {{http://image.url.com|width}}": "自訂圖像的寬度（像素）: {{http://image.url.com|width}}",
-    "Image: {{http://image.url.com}}": "圖像: {{http://image.url.com}}",
+    "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
+    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
     "Import data": "匯入資料",
     "Import in a new layer": "匯入至新圖層",
     "Imports all umap data, including layers and settings.": "匯入所有 umap 資料，包含圖層與設定。",
@@ -216,7 +216,7 @@
     "Limit bounds": "限制範圍",
     "Link to view the map": "檢視地圖的連結",
     "Link to…": "連結至...",
-    "Link with text: [[http://example.com|text of the link]]": "帶有超連結的文字: [[http://example.com|text of the link]]",
+    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
     "Long credits": "詳細工作人員名單",
     "Longitude": "經度",
     "Make main shape": "設為主要外形",
@@ -320,7 +320,7 @@
     "Show this layer in the caption": "在標題顯示此圖層",
     "Show/hide layer": "顯示/隱藏圖層",
     "Side panel": "側邊框",
-    "Simple link: [[http://example.com]]": "簡單連結: [[http://example.com]]",
+    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
     "Simplify": "簡化",
     "Skipping unknown geometry.type: {type}": "略過不明的 geometry.type: {type}",
     "Slideshow": "投影片",
@@ -445,7 +445,6 @@
     "More info about Overpass syntax": "更多 Overpass 語法資訊",
     "For more complex needs, see": "而更多複雜的需求，請見",
     "Choose data": "選擇日期",
-    "Import helpers:": "匯入幫手：",
     "Choose the format": "選擇格式",
     "Choose the layer": "選擇圖層",
     "Layer name": "圖層名稱",
@@ -497,21 +496,29 @@
     "Expression is empty": "表示式為空白",
     "OK": "確認",
     "Cancel": "取消",
-    "Attach map to a team": "Attach map to a team",
-    "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Proportional circles",
-    "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control",
-    "Copy as GeoJSON": "Copy as GeoJSON",
-    "Please zoom in to edit the geometry": "Please zoom in to edit the geometry",
-    "New map": "New map",
-    "My maps": "My maps",
-    "My teams": "My teams",
-    "My profile": "My profile",
-    "Type new owner's username": "Type new owner's username",
-    "Type editor's username": "Type editor's username",
-    "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Attach map to a team": "指定地圖到團隊",
+    "Display the polygon inverted": "顯示反向選擇的多邊形",
+    "Proportional circles": "部分圓圈",
+    "Property name to compute circles": "來計算圓圈的屬性名稱",
+    "Min circle radius": "最小圓圈半徑",
+    "Max circle radius": "最大圓圈半徑",
+    "Display the open browser control": "顯示開啟的瀏覽器控制",
+    "Copy as GeoJSON": "以 GeoJSON 複製",
+    "Please zoom in to edit the geometry": "請切換到編輯的幾何",
+    "New map": "新地圖",
+    "My maps": "我的地圖",
+    "My teams": "我的團隊",
+    "My profile": "我的個人檔案",
+    "Type new owner's username": "輸入新擁有者名稱",
+    "Type editor's username": "輸入編輯者名稱",
+    "Map": "地圖",
+    "Manage collaborators": "管理共編者",
+    "show/hide all layers": "顯示/隱藏所有圖層",
+    "zoom to data extent": "切換至資料範圍",
+    "download visible data": "下載可視資料",
+    "{connectedPeers} peer(s) currently connected to this map": "這份地圖已經有 {connectedPeers} 伙伴連線",
+    "Import helpers": "Import helpers",
+    "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
+    "Wikipedia": "Wikipedia",
+    "Save draft": "Save draft"
 }

umap/static/umap/map.css

@@ -45,9 +45,6 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
 .umap-edit-enabled {
     --current-header-height: var(--header-height);
 }
-.umap-caption-bar-enabled {
-    --current-footer-height: var(--footer-height);
-}
 .leaflet-top {
     top: var(--current-header-height);
 }
@@ -166,7 +163,7 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     min-height: 23px;
     height: 23px;
 }
-.leaflet-control-edit-enable [type="button"]:before {
+.edit-enable [type="button"]:before {
     content: ' ';
     width: 24px;
     height: 24px;
@@ -175,7 +172,7 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     background-image: url('./img/16-white.svg');
     background-position: -48px -48px;
 }
-.leaflet-control-edit-enable [type="button"] {
+.edit-enable [type="button"] {
     width: initial;
     padding: 0 20px;
     background-color: #353c3e;
@@ -187,7 +184,7 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     display: block;
 }
 .leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover,
-.leaflet-control-edit-enable [type="button"]:hover {
+.edit-enable [type="button"]:hover {
     background-color: #4d5759;
 }
 .umap-permanent-credits-container {
@@ -476,245 +473,12 @@ ul.photon-autocomplete {
 .umap-edit-actions li:hover {
     background-color: #353c3e;
 }
-
-
-/* ********************************* */
-/*   Edit main toolbox               */
-/* ********************************* */
-.umap-main-edit-toolbox [type="button"] {
-    color: #fff;
-    font-size: 1.2em;
-    border: none;
-    background-color: var(--color-darkGray);
-    width: auto;
-    margin-bottom: 0;
-}
-.umap-main-edit-toolbox [type="button"]:hover {
-    text-decoration: underline;
-}
-
-.leaflet-container [type="button"].umap-help-link {
-    font-size: 12px;
-    padding-bottom: 3px;
-    background-color: inherit;
-}
-.leaflet-container .leaflet-control-edit-save,
-.leaflet-container .leaflet-control-edit-cancel,
-.leaflet-container .leaflet-control-edit-disable,
-.leaflet-container .leaflet-control-connected-peers
-{
-    display: block;
-    border: none;
-    font-size: 12px;
-    border-radius: 20px;
-    color: #f8f8f8;
-    height: 32px;
-    line-height: 30px;
-    padding: 0 20px;
-}
-.leaflet-container .leaflet-control-connected-peers,
-.dark [type="button"].leaflet-control-connected-peers:hover
-{
-    background-color: var(--color-lightCyan);
-    color: var(--color-dark);
-}
-
-.leaflet-container .leaflet-control-edit-disable:before,
-.leaflet-container .leaflet-control-edit-save:before,
-.leaflet-container .leaflet-control-edit-cancel:before,
-.leaflet-container .leaflet-control-connected-peers:before {
-    display: inline-block;
-    width: 19px;
-    height: 24px;
-    background-position: -50px -122px;
-    background-repeat: no-repeat;
-    background-image: url('./img/16-white.svg');
-    vertical-align: middle;
-    content: ' ';
-    text-align: center;
-}
-
-.leaflet-container .leaflet-control-connected-peers:before {
-    background-image: url('./img/16.svg');
-}
-
-.leaflet-container .leaflet-control-edit-disable span,
-.leaflet-container .leaflet-control-edit-save span,
-.leaflet-container .leaflet-control-edit-cancel span,
-.leaflet-container .leaflet-control-connected-peers span{
-    margin-inline-start: 10px;
-}
-.leaflet-container .leaflet-control-edit-save:before {
-    background-position: -148px -2px;
-}
-.leaflet-container .leaflet-control-edit-disable:before {
-    background-position: -50px -25px;
-}
-.leaflet-container .leaflet-control-connected-peers:before {
-    background-position: -2px -95px;
-}
-.leaflet-container .leaflet-control-edit-cancel,
-.leaflet-container .leaflet-control-edit-disable,
-.leaflet-container .leaflet-control-connected-peers{
-    border: 0.5px solid rgba(153, 153, 153, 0.40);
-}
-.leaflet-container .leaflet-control-edit-cancel:hover,
-.leaflet-container .leaflet-control-edit-disable:hover {
-    border: 0.5px solid rgba(153, 153, 153, 0.80);
-    text-decoration: none;
-}
-.leaflet-container .leaflet-control-edit-save {
-    opacity: 0.5;
-    cursor: not-allowed;
-    border-radius: 16px;
-    border: 0.5px solid rgba(153, 153, 153, 0.40);
-    background: rgba(153, 153, 153, 0.10);
-}
-.dark [type="button"].leaflet-control-edit-save:hover {
-    background: rgba(153, 153, 153, 0.10);
-    text-decoration: none;
-}
-.umap-is-dirty .leaflet-control-edit-save {
-    opacity: 1;
-    cursor: pointer;
-    border: 0.5px solid rgba(66, 236, 230, 0.40);
-    background: rgba(66, 236, 230, 0.10);
-    color: #42ECE6;
-}
-.umap-is-dirty .leaflet-control-edit-save:before {
-    background-position: -148px -26px;
-}
-.umap-is-dirty .dark [type="button"].leaflet-control-edit-save:hover {
-    border-color: rgba(66, 236, 230, 0.80);
-    background: rgba(66, 236, 230, 0.10);
-}
-.leaflet-container .leaflet-control-edit-save,
-.leaflet-container .leaflet-control-edit-cancel,
-.leaflet-container .leaflet-control-edit-disable,
-.umap-edit-enabled .leaflet-control-edit-enable {
-    display: none;
-}
-.umap-edit-enabled .leaflet-control-edit-save,
-.umap-edit-enabled .leaflet-control-edit-disable,
-.umap-edit-enabled .umap-is-dirty .leaflet-control-edit-cancel {
-    display: inline-block;
-}
-.umap-is-dirty .leaflet-control-edit-disable {
-    display: none;
-}
-.umap-caption-bar {
-    display: none;
-}
-.umap-main-edit-toolbox {
-    top: -46px;
-    position: absolute;
-    width: 100%;
-    left: 0;
-    right: 0;
-    height: 46px;
-    padding: 0 10px;
-    text-align: start;
-    line-height: var(--control-size);
-    cursor: auto;
-    border-bottom: 1px solid #222;
-    z-index: var(--zindex-panels);
-    display: flex;
-    justify-content: space-between;
-    background-color: var(--background-color);
-    color: var(--text-color);
-}
-.umap-left-edit-toolbox,
-.umap-right-edit-toolbox {
-    display: flex;
-    column-gap: 10px;
-}
-.umap-right-edit-toolbox {
-    align-items: baseline;
-}
-
-.umap-main-edit-toolbox .logo {
-    width: 39px;
-    height: 100%;
-}
-.umap-main-edit-toolbox .logo a {
-    background-image: url('./img/logo_small.svg');
-    background-position: 0 center;
-    background-repeat: no-repeat;
-    display: inline-block;
-    width: 39px;
-    height: 100%;
-    vertical-align: middle;
-    text-indent: -9999px;
-}
-.umap-main-edit-toolbox .map-name {
-    display: inline-block;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    font-weight: bold;
-    text-align: start;
-}
-.umap-main-edit-toolbox .share-status {
-    font-size: 1em;
-    font-style: italic;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.map-name:after {
-    content:  '\00a0';
-    padding-inline-start: 3px;
-    width: 1ch;
-    display: inline-block;
-}
-.umap-is-dirty .map-name:after {
-    content:  '*';
-}
-.umap-edit-enabled .umap-main-edit-toolbox {
-    top: 0;
-}
-.umap-caption-bar h3,
-.umap-main-edit-toolbox h3 {
-    display: inline;
-}
-.umap-caption-bar button {
-    margin-inline-start: 10px;
-}
-.umap-caption-bar button + button:before {
-    content: '|';
-    padding-inline-end: 10px;
-}
-.umap-main-edit-toolbox .umap-user {
-    color: #fff;
-}
-.umap-main-edit-toolbox .umap-user:hover {
-    text-decoration: underline;
-}
-.umap-main-edit-toolbox .umap-user:after {
-    content: '|';
-    padding-inline-start: 20px;
-    display: inline-block; /* Prevents underline on hover. */
-}
-.umap-caption-bar-enabled .umap-caption-bar {
-    display: block;
-    height: var(--footer-height);
-    background-color: #fff;
-    width: 100%;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    padding: var(--gutter);
-    text-align: start;
-    line-height: 100%;
-    cursor: auto;
-    border-top: 1px solid var(--color-lightGray);
-    opacity: 0.93;
-    z-index: var(--zindex-panels);
-}
 .umap-help {
     font-style: italic;
 }
 
+
+
 .umap-datalayer-version {
     padding: 5px 0;
     border-bottom: 1px solid #202425;
@@ -1025,54 +789,6 @@ a.umap-control-caption,
     text-align: center;
 }
 
-/* ********************************* */
-/*           Popup                   */
-/* ********************************* */
-.umap-popup {
-    display: flex;
-    flex-flow: column nowrap;
-    height:100%;
-}
-
-.umap-popup-footer {
-    position: relative;
-    background-color: rgb(68, 68, 68);
-    color: white;
-    display: flex;
-    width: 100%;
-    margin-top: auto;
-    min-width: 99px;
-    border-radius: 2px;
-    max-height: 24px;
-    justify-content: space-around;
-}
-.umap-popup a:hover {
-    text-decoration: underline;
-}
-.popup-title {
-    display: flex;
-    align-items: center;
-}
-.popup-title .icon {
-    margin: 5px;
-}
-a[href^='mailto']::before {
-  content: '✉︎ ';
-}
-a[href^='tel']::before {
-  content: '☎︎ ';
-}
-address span {
-    padding-inline-end: 5px;
-}
-.osm-link {
-    margin-top: 10px;
-    text-align: end;
-    font-style: italic;
-}
-span.popup-icon {
-    padding: 5px;
-}
 
 
 /* ************* */
@@ -1403,75 +1119,6 @@ span.popup-icon {
 .leaflet-top, .leaflet-bottom {
     z-index: var(--zindex-controls);
 }
-.leaflet-popup-content {
-    min-width: 200px;
-    line-height: inherit;
-}
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-    box-shadow: 0 1px 6px rgba(0, 0, 0, 0.4);
-}
-.leaflet-popup-content-wrapper {
-    border-radius: 4px;
-}
-.umap-popup-content {
-    max-height: 500px;
-    flex-grow: 1;
-    margin-bottom: 4px;
-    display: flex;
-    flex-direction: column;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-.umap-popup-content iframe {
-    min-width: 300px;
-    max-width: 100%;
-}
-.umap-popup-content tr:nth-child(odd) {
-   background-color: #f6f6f6;
-}
-.umap-popup-content th {
-    text-align: start;
-}
-.umap-popup-content td {
-    word-break: break-word;
-}
-.umap-popup-content th,
-.umap-popup-content td {
-    padding: 1px 3px;
-}
-.umap-popup-container {
-    flex-grow: 1;
-    margin-bottom: 10px;
-}
-.umap-popup-container ul {
-    list-style-type: disc;
-}
-.leaflet-control-toolbar,
-.leaflet-bar {
-    box-shadow: none;
-}
-.marker-cluster {
-    background-color: white;
-    width: 40px;
-    height: 40px;
-}
-.leaflet-contextmenu-icon {
-    display: none;
-}
-.umap-popup-large iframe {
-    /* See https://github.com/Leaflet/Leaflet/commit/61d746818b99d362108545c151a27f09d60960ee#commitcomment-6061847 */
-    max-width: 100% !important;
-    min-width: 500px;
-}
-.umap-popup-large .umap-popup-content {
-    width: 500px;
-}
-.umap-popup-content img {
-    max-width: 100%;
-}
-.umap-georss-link .popup-title {
-    text-align: center;
-}
 .leaflet-inplace-toolbar {
   z-index: var(--zindex-toolbar)!important;
 }
@@ -1547,12 +1194,6 @@ span.popup-icon {
     .umap-permanent-credits-container {
         max-width: 100%;
     }
-    .umap-popup-large iframe {
-        min-width: 300px;
-    }
-    .umap-popup-large .umap-popup-content {
-        width: 300px;
-    }
 
     .attribution-toggle {
         display: inline-block;

umap/static/umap/unittests/URLs.js

@@ -8,10 +8,10 @@ import URLs from '../js/modules/urls.js'
 describe('URLs', () => {
   // Mock server URLs that will be used for testing
   const mockServerUrls = {
-    map_create: '/maps/create',
-    map_update: '/maps/{map_id}/update',
-    datalayer_create: '/maps/{map_id}/datalayers/create',
-    datalayer_update: '/maps/{map_id}/datalayers/{pk}/update',
+    map_create: '/maps/create/',
+    map_update: '/maps/{map_id}/update/',
+    datalayer_create: '/maps/{map_id}/datalayers/{pk}/create/',
+    datalayer_update: '/maps/{map_id}/datalayers/{pk}/update/',
   }
 
   let urls = new URLs(mockServerUrls)
@@ -22,37 +22,37 @@ describe('URLs', () => {
     })
 
     it('should return the correct templated URL for known urlNames', () => {
-      expect(urls.get('map_create')).to.be.equal('/maps/create')
-      expect(urls.get('map_update', { map_id: '123' })).to.be.equal('/maps/123/update')
+      expect(urls.get('map_create')).to.be.equal('/maps/create/')
+      expect(urls.get('map_update', { map_id: '123' })).to.be.equal('/maps/123/update/')
     })
 
     it('should return the correct templated URL when provided with parameters', () => {
       expect(urls.get('datalayer_update', { map_id: '123', pk: '456' })).to.be.equal(
-        '/maps/123/datalayers/456/update'
+        '/maps/123/datalayers/456/update/'
       )
     })
   })
 
   describe('map_save()', () => {
     it('should return the create URL if no map_id is provided', () => {
-      expect(urls.map_save({})).to.be.equal('/maps/create')
+      expect(urls.map_save({})).to.be.equal('/maps/create/')
     })
 
     it('should return the update URL if a map_id is provided', () => {
-      expect(urls.map_save({ map_id: '123' })).to.be.equal('/maps/123/update')
+      expect(urls.map_save({ map_id: '123' })).to.be.equal('/maps/123/update/')
     })
   })
 
   describe('datalayer_save()', () => {
-    it('should return the create URL if no pk is provided', () => {
-      expect(urls.datalayer_save({ map_id: '123' })).to.be.equal(
-        '/maps/123/datalayers/create'
+    it('should return the create URL if created is false', () => {
+      expect(urls.datalayer_save({ map_id: '123', pk: '00000000-0000-0000-0000-000000000000', created: false })).to.be.equal(
+        '/maps/123/datalayers/00000000-0000-0000-0000-000000000000/create/'
       )
     })
 
-    it('should return the update URL if a pk is provided', () => {
-      expect(urls.datalayer_save({ map_id: '123', pk: '456' })).to.be.equal(
-        '/maps/123/datalayers/456/update'
+    it('should return the update URL if created is true', () => {
+      expect(urls.datalayer_save({ map_id: '123', pk: '00000000-0000-0000-0000-000000000000', created: true })).to.be.equal(
+        '/maps/123/datalayers/00000000-0000-0000-0000-000000000000/update/'
       )
     })
   })

umap/static/umap/unittests/utils.js

@@ -147,7 +147,7 @@ describe('Utils', () => {
       )
     })
 
-    it('should handle iframe with height with px', () => {
+    it('should handle double iframe', () => {
       assert.equal(
         Utils.toHTML(
           'A double iframe: {{{https://osm.org/pouet}}}{{{https://osm.org/boudin}}}'
@@ -156,6 +156,15 @@ describe('Utils', () => {
       )
     })
 
+    it('should handle iframe with query string and space', () => {
+      assert.equal(
+        Utils.toHTML(
+          'An iframe with query string: {{{https://osm.org/pouet.html?name=foobar&description=baz baz}}}'
+        ),
+        'An iframe with query string: <div><iframe height="300px" width="100%" src="https://osm.org/pouet.html?name=foobar&amp;description=baz baz" frameborder="0"></iframe></div>'
+      )
+    })
+
     it('http link with http link as parameter as variable', () => {
       assert.equal(
         Utils.toHTML('A phrase with a [[http://iframeurl.com?to=http://another.com]].'),
@@ -263,6 +272,19 @@ describe('Utils', () => {
       )
     })
 
+    it('should process variables in http links', () => {
+      assert.equal(
+        Utils.greedyTemplate(
+          'A phrase with a {{{https://osm.org/pouet?name={name}&description={description}}}}.',
+          {
+            name: 'foobar',
+            description: 'bazbaz',
+          }
+        ),
+        'A phrase with a {{{https://osm.org/pouet?name=foobar&description=bazbaz}}}.'
+      )
+    })
+
     it('should not accept dash', () => {
       assert.equal(
         Utils.greedyTemplate('A phrase with a {var-iable}.', { 'var-iable': 'value' }),

umap/static/umap/vars.css

@@ -2,9 +2,11 @@
     /* Colors. */
     --color-waterMint: #B9F5D2;
     --color-darkBlue: #263B58;
+    --color-lighterGray: #f6f6f6;
     --color-lightGray: #ddd;
     --color-mediumGray: #3e4444;
     --color-darkGray: #323737;
+    --color-darkerGray: #2a2e30;
     --color-light: white;
     --color-dark: black;
     --color-limeGreen: #b9f5d2;

umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js

@@ -63,7 +63,11 @@ L.FormBuilder = L.Evented.extend({
     const path = field.split('.')
     let value = this.obj
     for (const sub of path) {
-      value = value[sub]
+      try {
+        value = value[sub]
+      } catch {
+        console.log(field)
+      }
     }
     return value
   },