umap-project 2.3.1__py3-none-any.whl → 2.4.0b0__py3-none-any.whl

umap/static/umap/locale/zh_TW.json

@@ -48,16 +48,12 @@
     "by": "由",
     "Cache proxied request": "快取代理請求",
     "Cancel edits": "取消編輯",
-    "Cancel": "取消",
     "Caption": "標題",
     "Center map on your location": "將您的位置設為地圖中心",
     "Change map background": "更改地圖背景",
     "Change tilelayers": "改變地圖磚圖層",
     "Change": "變動",
-    "Choose a preset": "選擇一種預設值",
     "Choose the data format": "選擇資料格式",
-    "Choose the format of the data to import": "選擇匯入的資料格式",
-    "Choose the layer to import in": "選擇匯入圖層",
     "Choropleth breakpoints": "等時線圖點",
     "Choropleth classes": "等時線圖類型",
     "Choropleth color palette": "等時線圖色彩盤",
@@ -87,7 +83,6 @@
     "Congratulations, your map has been created!": "恭喜您的地圖已經新增完成",
     "Continue line": "連續線段",
     "Coordinates": "座標",
-    "Copy link": "複製連結",
     "copy": "複製",
     "Credits": "工作人員名單",
     "Current map view": "目前地圖檢視",
@@ -152,7 +147,6 @@
     "Edit the title of the map": "編輯地圖標題",
     "Edit this feature": "編輯此圖徵",
     "Edit": "編輯",
-    "Email": "電子郵件",
     "Embed and link options": "嵌入與連結選項",
     "Embed the map": "嵌入地圖",
     "Emoji & Character": "表情符號和字元",
@@ -200,7 +194,6 @@
     "Image: {{http://image.url.com}}": "圖像: {{http://image.url.com}}",
     "Import data": "匯入資料",
     "Import in a new layer": "匯入至新圖層",
-    "Import": "匯入",
     "Imports all umap data, including layers and settings.": "匯入所有 umap 資料，包含圖層與設定。",
     "Include full screen link?": "是否包含全螢幕的連結？",
     "Inherit": "繼承",
@@ -311,7 +304,6 @@
     "Rename this property on all the features": "在所有特徵中重新命名該物件",
     "Replace layer content": "取代圖層內容",
     "Restore this version": "回復此版本",
-    "Save anyway": "通通都儲存吧！",
     "Save current edits": "儲存近期的變更",
     "Save map": "儲存地圖",
     "Save this center and zoom": "保存地圖中心點位置與縮放大小",
@@ -320,12 +312,9 @@
     "Saved center and zoom": "儲存地圖中心點位置與縮放大小",
     "Search location": "搜尋地點",
     "Search": "搜尋",
-    "Secret edit link copied to clipboard!": "複製私密編輯連結到剪貼簿！",
     "Secret edit link:": "祕密編輯連結：",
-    "See layers": "See layers",
     "See full screen": "觀看全螢幕",
     "See on OpenStreetMap": "在開放街圖檢視",
-    "Send me the link": "寄送連結給我",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "設定為假時，在幻燈片時、資料檢視器和彈出式導航中可將此圖層隱藏...",
     "settings": "設定",
     "Shape properties": "形狀屬性",
@@ -398,9 +387,7 @@
     "Will be displayed in the bottom right corner of the map": "將會顯示在地圖的右下角",
     "Will be permanently visible in the bottom left corner of the map": "Will be permanently visible in the bottom left corner of the map",
     "Will be visible in the caption of the map": "標題將出現在地圖上",
-    "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "糟糕，好像有人正在進行編輯，您仍可儲存資料，但您做的變更將被他人修改取代。",
     "yes": "是",
-    "Your map has been created! As you are not logged in, here is your secret link to edit the map, please keep it safe:": "已經新增你的地圖！由於你並未登入，這是你的編輯地圖的祕密連結，請妥善保管：",
     "Zoom in": "放大",
     "Zoom level for automatic zooms": "自動縮放的比例大小",
     "Zoom out": "縮小",
@@ -444,7 +431,55 @@
     "Filter data": "Filter data",
     "Search map features…": "Search map features…",
     "Reset all": "Reset all",
-    "Browser in data mode": "Browser in data mode",
-    "Browser in layers mode": "Browser in layers mode",
-    "Browser in filters mode": "Browser in filters mode"
+    "Open browser": "Open browser",
+    "Open caption": "Open caption",
+    "Your map has been created with an anonymous account!": "Your map has been created with an anonymous account!",
+    "Real-time collaboration": "Real-time collaboration",
+    "Cannot parse data": "Cannot parse data",
+    "Start typing...": "Start typing...",
+    "No result": "No result",
+    "Data browser": "Data browser",
+    "When providing an URL, uMap can copy the remote data in a layer, or add this URL as remote source of the layer. In that case, data will always be fetched from that URL, and thus be up to date, but it will not be possible to edit it inside uMap.": "When providing an URL, uMap can copy the remote data in a layer, or add this URL as remote source of the layer. In that case, data will always be fetched from that URL, and thus be up to date, but it will not be possible to edit it inside uMap.",
+    "Overpass supported expressions": "Overpass supported expressions",
+    "key (eg. building)": "key (eg. building)",
+    "!key (eg. !name)": "!key (eg. !name)",
+    "key=value (eg. building=yes)": "key=value (eg. building=yes)",
+    "key!=value (eg. building!=yes)": "key!=value (eg. building!=yes)",
+    "key~value (eg. name~Grisy)": "key~value (eg. name~Grisy)",
+    "key=\"value|value2\" (eg. name=\"Paris|Berlin\")": "key=\"value|value2\" (eg. name=\"Paris|Berlin\")",
+    "More info about Overpass syntax": "More info about Overpass syntax",
+    "For more complex needs, see": "For more complex needs, see",
+    "Choose data": "Choose data",
+    "Import helpers:": "Import helpers:",
+    "Choose the format": "Choose the format",
+    "Choose the layer": "Choose the layer",
+    "Layer name": "Layer name",
+    "Choose import mode": "Choose import mode",
+    "Copy into the layer": "Copy into the layer",
+    "Link to the layer as remote data": "Link to the layer as remote data",
+    "Condition": "Condition",
+    "key=value or key!=value": "key=value or key!=value",
+    "Are you sure you want to delete this rule?": "Are you sure you want to delete this rule?",
+    "empty rule": "empty rule",
+    "Conditional style rules": "Conditional style rules",
+    "Add rule": "Add rule",
+    "Browser: data": "Browser: data",
+    "Browser: layers": "Browser: layers",
+    "Browser: filters": "Browser: filters",
+    "Enable real-time collaboration": "Enable real-time collaboration",
+    "✅ Copied!": "✅ Copied!",
+    "Choose a dataset": "Choose a dataset",
+    "Choose this dataset": "Choose this dataset",
+    "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
+    "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
+    "Choose this data": "Choose this data",
+    "Search admin boundary": "Search admin boundary",
+    "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
+    "Expression": "Expression",
+    "Geometry mode": "Geometry mode",
+    "Only geometry centers": "Only geometry centers",
+    "Search area": "Search area",
+    "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
+    "Please define an expression for the query first": "Please define an expression for the query first"
 }

umap/static/umap/map.css

@@ -17,6 +17,24 @@
 }
 
 
+/* *********** */
+/* Structure   */
+/* *********** */
+
+.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);
+}
+.leaflet-bottom {
+    bottom: var(--current-footer-height);
+}
+
+
 /* *********** */
 /* Controls    */
 /* *********** */
@@ -99,10 +117,10 @@
     box-shadow: 0 0 4px 0 black inset;
 }
 .leaflet-control-star [type="button"] {
-    background-position: -108px -144px;
+    background-position: -144px -144px;
 }
 .leaflet-control-star.starred [type="button"] {
-    background-position: -144px -144px;
+    background-position: -108px -144px;
 }
 .leaflet-control-search [type="button"] {
     background-position: -36px -108px;
@@ -390,24 +408,6 @@ ul.photon-autocomplete {
 /* ********************************* */
 /*     Help Lightbox                 */
 /* ********************************* */
-.umap-help-box {
-    z-index: 10001;
-    position: absolute;
-    margin: 0 calc(50% - 500px/2);
-    width: 500px;
-    max-width: 100vw;
-    padding: 40px 20px;
-    border: 1px solid #222;
-    background-color: var(--color-darkGray);
-    color: #efefef;
-    font-size: 0.8em;
-    visibility: hidden;
-    top: -100%;
-}
-.umap-help-box .umap-close-link {
-    float: right;
-    width: 100px;
-}
 .umap-help-button {
     display: inline-block;
     width: 16px;
@@ -426,10 +426,6 @@ ul.photon-autocomplete {
 .dark .umap-help-button {
     background-image: url('./img/16-white.svg');
  }
-.umap-help-on .umap-help-box {
-    visibility: visible;
-    top: 100px;
-}
 .umap-help-entry + .umap-help-entry {
     margin-top: 10px;
     border-top: 1px solid #aaa;
@@ -639,9 +635,6 @@ ul.photon-autocomplete {
 .umap-edit-enabled .umap-main-edit-toolbox {
     top: 0;
 }
-.umap-edit-enabled .umap-caption-bar {
-    display: none;
-}
 .umap-caption-bar h3,
 .umap-main-edit-toolbox h3 {
     display: inline;
@@ -664,29 +657,23 @@ ul.photon-autocomplete {
     padding-left: 20px;
     display: inline-block; /* Prevents underline on hover. */
 }
-.umap-edit-enabled .leaflet-top {
-    top: 46px;
-}
 .umap-caption-bar-enabled .umap-caption-bar {
     display: block;
-    height: 46px;
+    height: var(--footer-height);
     background-color: #fff;
     width: 100%;
     position: absolute;
     left: 0;
     bottom: 0;
     right: 0;
-    padding: 0 0 0 5px;
+    padding: var(--gutter);
     text-align: left;
-    line-height: 46px;
+    line-height: 100%;
     cursor: auto;
     border-top: 1px solid var(--color-lightGray);
     opacity: 0.93;
     z-index: 1000;
 }
-.umap-caption-bar-enabled .leaflet-bottom {
-    bottom: 46px;
-}
 .umap-help {
     font-style: italic;
 }
@@ -1000,9 +987,6 @@ a.umap-control-caption,
 .datalayer-name {
     cursor: pointer;
 }
-.umap-caption h3 {
-    margin-bottom: 0;
-}
 .umap-caption .umap-map-owner {
     padding-left: 31px;
 }
@@ -1576,9 +1560,11 @@ span.popup-icon {
 .umap-popup-container {
     flex-grow: 1;
     word-break: break-word;
+    white-space: pre-line;
+    margin-bottom: 10px;
 }
-.leaflet-popup-content h3 {
-    margin-bottom: 0;
+.umap-popup-container ul {
+    list-style-type: disc;
 }
 .leaflet-control-toolbar,
 .leaflet-bar {

umap/static/umap/unittests/sync.js

@@ -0,0 +1,105 @@
+import { describe, it } from 'mocha'
+import sinon from 'sinon'
+
+import pkg from 'chai'
+const { expect } = pkg
+
+import { MapUpdater } from '../js/modules/sync/updaters.js'
+import { SyncEngine } from '../js/modules/sync/engine.js'
+
+describe('SyncEngine', () => {
+  it('should initialize methods even before start', function () {
+    const engine = new SyncEngine({})
+    engine.upsert()
+    engine.update()
+    engine.delete()
+  })
+})
+
+describe('#dispatch', function () {
+  it('should raise an error on unknown updater', function () {
+    const dispatcher = new SyncEngine({})
+    expect(() => {
+      dispatcher.dispatch({
+        kind: 'operation',
+        subject: 'unknown',
+        metadata: {},
+      })
+    }).to.throw(Error)
+  })
+  it('should produce an error on malformated messages', function () {
+    const dispatcher = new SyncEngine({})
+    expect(() => {
+      dispatcher.dispatch({
+        yeah: 'yeah',
+        payload: { foo: 'bar' },
+      })
+    }).to.throw(Error)
+  })
+  it('should raise an unknown operations', function () {
+    const dispatcher = new SyncEngine({})
+    expect(() => {
+      dispatcher.dispatch({
+        kind: 'something-else',
+      })
+    }).to.throw(Error)
+  })
+})
+
+describe('Updaters', () => {
+  describe('BaseUpdater', function () {
+    let updater
+    let map
+    let obj
+
+    this.beforeEach(function () {
+      map = {}
+      updater = new MapUpdater(map)
+      obj = {}
+    })
+    it('should be able to set object properties', function () {
+      let obj = {}
+      updater.updateObjectValue(obj, 'foo', 'foo')
+      expect(obj).deep.equal({ foo: 'foo' })
+    })
+
+    it('should be able to set object properties recursively on existing objects', function () {
+      let obj = { foo: {} }
+      updater.updateObjectValue(obj, 'foo.bar', 'foo')
+      expect(obj).deep.equal({ foo: { bar: 'foo' } })
+    })
+
+    it('should be able to set object properties recursively on deep objects', function () {
+      let obj = { foo: { bar: { baz: {} } } }
+      updater.updateObjectValue(obj, 'foo.bar.baz.test', 'value')
+      expect(obj).deep.equal({ foo: { bar: { baz: { test: 'value' } } } })
+    })
+
+    it('should be able to replace object properties recursively on deep objects', function () {
+      let obj = { foo: { bar: { baz: { test: 'test' } } } }
+      updater.updateObjectValue(obj, 'foo.bar.baz.test', 'value')
+      expect(obj).deep.equal({ foo: { bar: { baz: { test: 'value' } } } })
+    })
+
+    it('should not set object properties recursively on non-existing objects', function () {
+      let obj = { foo: {} }
+      updater.updateObjectValue(obj, 'bar.bar', 'value')
+
+      expect(obj).deep.equal({ foo: {} })
+    })
+
+    it('should delete keys for undefined values', function () {
+      let obj = { foo: 'foo' }
+      updater.updateObjectValue(obj, 'foo', undefined)
+
+      expect(obj).deep.equal({})
+    })
+
+    it('should delete keys for undefined values, recursively', function () {
+      let obj = { foo: { bar: 'bar' } }
+      updater.updateObjectValue(obj, 'foo.bar', undefined)
+
+      expect(obj).deep.equal({ foo: {} })
+    })
+  })
+})

umap/static/umap/unittests/utils.js

@@ -13,12 +13,12 @@ describe('Utils', function () {
     it('should handle title', function () {
       assert.equal(Utils.toHTML('# A title'), '<h3>A title</h3>')
     })
+    it('should handle title followed by text', function () {
+      assert.equal(Utils.toHTML('# A title\nSome text.'), '<h3>A title</h3>Some text.')
+    })
 
     it('should handle title in the middle of the content', function () {
-      assert.equal(
-        Utils.toHTML('A phrase\n## A title'),
-        'A phrase<br>\n<h4>A title</h4>'
-      )
+      assert.equal(Utils.toHTML('A phrase\n## A title'), 'A phrase\n<h4>A title</h4>')
     })
 
     it('should handle hr', function () {
@@ -33,18 +33,6 @@ describe('Utils', function () {
       assert.equal(Utils.toHTML('Some *italic*'), 'Some <em>italic</em>')
     })
 
-    it('should handle newlines', function () {
-      assert.equal(Utils.toHTML('two\nlines'), 'two<br>\nlines')
-    })
-
-    it('should not change last newline', function () {
-      assert.equal(Utils.toHTML('two\nlines\n'), 'two<br>\nlines\n')
-    })
-
-    it('should handle two successive newlines', function () {
-      assert.equal(Utils.toHTML('two\n\nlines\n'), 'two<br>\n<br>\nlines\n')
-    })
-
     it('should handle links without formatting', function () {
       assert.equal(
         Utils.toHTML('A simple http://osm.org link'),
@@ -90,7 +78,7 @@ describe('Utils', function () {
     it('should handle simple link followed by a carriage return', function () {
       assert.equal(
         Utils.toHTML('A simple link http://osm.org\nAnother line'),
-        'A simple link <a href="http://osm.org" target="_blank">http://osm.org</a><br>\nAnother line'
+        'A simple link <a href="http://osm.org" target="_blank">http://osm.org</a>\nAnother line'
       )
     })
 
@@ -174,6 +162,27 @@ describe('Utils', function () {
         'A phrase with a <a href="http://iframeurl.com?to=http://another.com" target="_blank">http://iframeurl.com?to=http://another.com</a>.'
       )
     })
+
+    it('simple bullet points', function () {
+      assert.equal(
+        Utils.toHTML('* First point\n* Second point\n* Last point'),
+        '<ul><li>First point</li><li>Second point</li><li>Last point</li></ul>'
+      )
+    })
+
+    it('bullet points with bold and italic', function () {
+      assert.equal(
+        Utils.toHTML('* First *point*\n* Second **point**\n* Last [[https://here.org|point]]'),
+        '<ul><li>First <em>point</em></li><li>Second <strong>point</strong></li><li>Last <a href="https://here.org" target="_blank">point</a></li></ul>'
+      )
+    })
+
+    it('title followed by bullet points', function () {
+      assert.equal(
+        Utils.toHTML('## Some title\n* First *point*\n* Second **point**\n* Last [[https://here.org|point]]'),
+        '<h4>Some title</h4><ul><li>First <em>point</em></li><li>Second <strong>point</strong></li><li>Last <a href="https://here.org" target="_blank">point</a></li></ul>'
+      )
+    })
   })
 
   describe('#escapeHTML', function () {
@@ -192,6 +201,24 @@ describe('Utils', function () {
       )
     })
 
+    it('should not escape video tag with dedicated attributes', function () {
+      assert.equal(
+        Utils.escapeHTML(
+          '<video width="100%" height="281" controls><source type="video/mp4" src="movie.mp4"></video>'
+        ),
+        '<video controls="" height="281" width="100%"><source src="movie.mp4" type="video/mp4"></video>'
+      )
+    })
+
+    it('should not escape audio tag with dedicated attributes', function () {
+      assert.equal(
+        Utils.escapeHTML(
+          '<audio controls><source type="audio/ogg" src="horse.ogg"></audio>'
+        ),
+        '<audio controls=""><source src="horse.ogg" type="audio/ogg"></audio>'
+      )
+    })
+
     it('should not fail with int value', function () {
       assert.equal(Utils.escapeHTML(25), '25')
     })
@@ -461,13 +488,12 @@ describe('Utils', function () {
   })
 
   describe('#normalize()', function () {
-    it('should remove accents',
-      function () {
-        // French é
-        assert.equal(Utils.normalize('aéroport'), 'aeroport')
-        // American é
-        assert.equal(Utils.normalize('aéroport'), 'aeroport')
-      })
+    it('should remove accents', function () {
+      // French é
+      assert.equal(Utils.normalize('aéroport'), 'aeroport')
+      // American é
+      assert.equal(Utils.normalize('aéroport'), 'aeroport')
+    })
   })
 
   describe('#sortFeatures()', function () {
@@ -530,17 +556,17 @@ describe('Utils', function () {
     })
   })
 
-  describe("#copyJSON", function () {
+  describe('#copyJSON', function () {
     it('should actually copy the JSON', function () {
-      let originalJSON = { "some": "json" }
+      let originalJSON = { some: 'json' }
       let returned = Utils.CopyJSON(originalJSON)
 
       // Change the original JSON
-      originalJSON["anotherKey"] = "value"
+      originalJSON['anotherKey'] = 'value'
 
       // ensure the two aren't the same object
       assert.notEqual(returned, originalJSON)
-      assert.deepEqual(returned, { "some": "json" })
+      assert.deepEqual(returned, { some: 'json' })
     })
   })
 
@@ -597,21 +623,37 @@ describe('Utils', function () {
       assert.deepEqual(getImpactsFromSchema(['foo', 'bar', 'baz'], schema), ['A', 'B'])
     })
   })
-  describe('parseNaiveDate', () => {
+
+  describe('#parseNaiveDate', () => {
     it('should parse a date', () => {
-      assert.equal(Utils.parseNaiveDate("2024/03/04").toISOString(), "2024-03-04T00:00:00.000Z")
+      assert.equal(
+        Utils.parseNaiveDate('2024/03/04').toISOString(),
+        '2024-03-04T00:00:00.000Z'
+      )
     })
     it('should parse a datetime', () => {
-      assert.equal(Utils.parseNaiveDate("2024/03/04 12:13:14").toISOString(), "2024-03-04T00:00:00.000Z")
+      assert.equal(
+        Utils.parseNaiveDate('2024/03/04 12:13:14').toISOString(),
+        '2024-03-04T00:00:00.000Z'
+      )
     })
     it('should parse an iso datetime', () => {
-      assert.equal(Utils.parseNaiveDate("2024-03-04T00:00:00.000Z").toISOString(), "2024-03-04T00:00:00.000Z")
+      assert.equal(
+        Utils.parseNaiveDate('2024-03-04T00:00:00.000Z').toISOString(),
+        '2024-03-04T00:00:00.000Z'
+      )
     })
     it('should parse a GMT time', () => {
-      assert.equal(Utils.parseNaiveDate("04 Mar 2024 00:12:00 GMT").toISOString(), "2024-03-04T00:00:00.000Z")
+      assert.equal(
+        Utils.parseNaiveDate('04 Mar 2024 00:12:00 GMT').toISOString(),
+        '2024-03-04T00:00:00.000Z'
+      )
     })
     it('should parse a GMT time with explicit timezone', () => {
-      assert.equal(Utils.parseNaiveDate("Thu, 04 Mar 2024 00:00:00 GMT+0300").toISOString(), "2024-03-03T00:00:00.000Z")
+      assert.equal(
+        Utils.parseNaiveDate('Thu, 04 Mar 2024 00:00:00 GMT+0300').toISOString(),
+        '2024-03-03T00:00:00.000Z'
+      )
     })
   })
 })

umap/static/umap/vars.css

@@ -8,9 +8,12 @@
     --color-limeGreen: #b9f5d2;
     --color-brightCyan: #46ece6;
     --color-lightCyan: #d4fbf9;
+    --color-red: #c60f13;
+    --color-darkRed: #5b2a2a;
 
     --background-color: var(--color-light);
     --color-accent: var(--color-brightCyan);
+    --text-color: black;
 
     /* Buttons. */
     --button-primary-background: var(--color-waterMint);
@@ -19,14 +22,28 @@
     --button-neutral-color: var(--color-darkGray);
 
     /* Sizes and spaces */
+    --gutter: 8px;
     --panel-gutter: 10px;
     --panel-bottom: 40px;
     --panel-header-height: 36px;
     --panel-width: 400px;
     --header-height: 46px;
-    --footer-height: 46px;
+    --current-header-height: 0px;
+    --footer-height: 28px;
+    --current-footer-height: 0px;
     --control-size: 36px;
+    --border-radius: 4px;
+    --box-padding: 20px;
+    --box-margin: 14px;
 }
 .dark {
     --background-color: var(--color-darkGray);
+    --text-color: #efefef;
+}
+
+@media only screen and (max-width:770px) {
+    :root {
+        --box-padding: 10px;
+        --box-margin: 7px;
+    }
 }