umap-project 2.1.3__py3-none-any.whl → 2.2.0b0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of umap-project might be problematic. Click here for more details.

Files changed (196) hide show
  1. umap/__init__.py +1 -1
  2. umap/context_processors.py +1 -0
  3. umap/locale/br/LC_MESSAGES/django.mo +0 -0
  4. umap/locale/en/LC_MESSAGES/django.po +32 -32
  5. umap/locale/hu/LC_MESSAGES/django.mo +0 -0
  6. umap/locale/it/LC_MESSAGES/django.mo +0 -0
  7. umap/locale/ms/LC_MESSAGES/django.mo +0 -0
  8. umap/migrations/0020_alter_tilelayer_url_template.py +19 -0
  9. umap/migrations/0021_remove_map_description.py +16 -0
  10. umap/models.py +8 -6
  11. umap/settings/base.py +1 -0
  12. umap/static/umap/base.css +29 -151
  13. umap/static/umap/content.css +7 -25
  14. umap/static/umap/css/icon.css +112 -0
  15. umap/static/umap/css/panel.css +140 -0
  16. umap/static/umap/img/16-white.svg +5 -1
  17. umap/static/umap/img/16.svg +7 -4
  18. umap/static/umap/img/24-white.svg +3 -1
  19. umap/static/umap/img/24.svg +3 -4
  20. umap/static/umap/img/source/16-white.svg +176 -940
  21. umap/static/umap/img/source/16.svg +8 -5
  22. umap/static/umap/img/source/24-white.svg +5 -3
  23. umap/static/umap/img/source/24.svg +6 -7
  24. umap/static/umap/js/modules/browser.js +82 -73
  25. umap/static/umap/js/modules/dompurify.js +12 -0
  26. umap/static/umap/js/modules/facets.js +148 -0
  27. umap/static/umap/js/modules/global.js +9 -1
  28. umap/static/umap/js/modules/i18n.js +7 -0
  29. umap/static/umap/js/modules/orderable.js +84 -0
  30. umap/static/umap/js/modules/panel.js +76 -0
  31. umap/static/umap/js/modules/request.js +0 -1
  32. umap/static/umap/js/modules/schema.js +324 -223
  33. umap/static/umap/js/modules/urls.js +1 -16
  34. umap/static/umap/js/modules/utils.js +340 -0
  35. umap/static/umap/js/umap.controls.js +183 -330
  36. umap/static/umap/js/umap.core.js +60 -364
  37. umap/static/umap/js/umap.datalayer.permissions.js +1 -1
  38. umap/static/umap/js/umap.features.js +60 -40
  39. umap/static/umap/js/umap.forms.js +111 -25
  40. umap/static/umap/js/umap.icon.js +11 -4
  41. umap/static/umap/js/umap.importer.js +24 -17
  42. umap/static/umap/js/umap.js +170 -145
  43. umap/static/umap/js/umap.layer.js +71 -40
  44. umap/static/umap/js/umap.permissions.js +9 -11
  45. umap/static/umap/js/umap.popup.js +10 -21
  46. umap/static/umap/js/umap.share.js +11 -8
  47. umap/static/umap/js/umap.tableeditor.js +4 -6
  48. umap/static/umap/js/umap.ui.js +0 -51
  49. umap/static/umap/locale/am_ET.js +242 -227
  50. umap/static/umap/locale/am_ET.json +18 -7
  51. umap/static/umap/locale/ar.js +242 -227
  52. umap/static/umap/locale/ar.json +18 -7
  53. umap/static/umap/locale/ast.js +242 -227
  54. umap/static/umap/locale/ast.json +18 -7
  55. umap/static/umap/locale/bg.js +242 -227
  56. umap/static/umap/locale/bg.json +18 -7
  57. umap/static/umap/locale/br.js +252 -237
  58. umap/static/umap/locale/br.json +22 -11
  59. umap/static/umap/locale/ca.js +242 -227
  60. umap/static/umap/locale/ca.json +18 -7
  61. umap/static/umap/locale/cs_CZ.js +242 -227
  62. umap/static/umap/locale/cs_CZ.json +18 -7
  63. umap/static/umap/locale/da.js +242 -227
  64. umap/static/umap/locale/da.json +18 -7
  65. umap/static/umap/locale/de.js +242 -227
  66. umap/static/umap/locale/de.json +18 -7
  67. umap/static/umap/locale/el.js +242 -227
  68. umap/static/umap/locale/el.json +18 -7
  69. umap/static/umap/locale/en.js +242 -234
  70. umap/static/umap/locale/en.json +19 -8
  71. umap/static/umap/locale/en_US.json +18 -7
  72. umap/static/umap/locale/es.js +242 -227
  73. umap/static/umap/locale/es.json +18 -7
  74. umap/static/umap/locale/et.js +242 -227
  75. umap/static/umap/locale/et.json +18 -7
  76. umap/static/umap/locale/eu.js +227 -199
  77. umap/static/umap/locale/eu.json +1 -1
  78. umap/static/umap/locale/fa_IR.js +242 -227
  79. umap/static/umap/locale/fa_IR.json +18 -7
  80. umap/static/umap/locale/fi.js +242 -227
  81. umap/static/umap/locale/fi.json +18 -7
  82. umap/static/umap/locale/fr.js +242 -234
  83. umap/static/umap/locale/fr.json +18 -7
  84. umap/static/umap/locale/gl.js +242 -227
  85. umap/static/umap/locale/gl.json +18 -7
  86. umap/static/umap/locale/he.js +242 -227
  87. umap/static/umap/locale/he.json +18 -7
  88. umap/static/umap/locale/hr.js +242 -227
  89. umap/static/umap/locale/hr.json +18 -7
  90. umap/static/umap/locale/hu.js +242 -234
  91. umap/static/umap/locale/hu.json +18 -7
  92. umap/static/umap/locale/id.js +242 -227
  93. umap/static/umap/locale/id.json +18 -7
  94. umap/static/umap/locale/is.js +242 -227
  95. umap/static/umap/locale/is.json +18 -7
  96. umap/static/umap/locale/it.js +242 -234
  97. umap/static/umap/locale/it.json +18 -7
  98. umap/static/umap/locale/ja.js +242 -227
  99. umap/static/umap/locale/ja.json +18 -7
  100. umap/static/umap/locale/ko.js +242 -227
  101. umap/static/umap/locale/ko.json +18 -7
  102. umap/static/umap/locale/lt.js +242 -227
  103. umap/static/umap/locale/lt.json +18 -7
  104. umap/static/umap/locale/ms.js +242 -234
  105. umap/static/umap/locale/ms.json +19 -8
  106. umap/static/umap/locale/nl.js +245 -230
  107. umap/static/umap/locale/nl.json +18 -7
  108. umap/static/umap/locale/no.js +242 -227
  109. umap/static/umap/locale/no.json +18 -7
  110. umap/static/umap/locale/pl.js +242 -227
  111. umap/static/umap/locale/pl.json +18 -7
  112. umap/static/umap/locale/pl_PL.json +18 -7
  113. umap/static/umap/locale/pt.js +242 -227
  114. umap/static/umap/locale/pt.json +18 -7
  115. umap/static/umap/locale/pt_BR.js +242 -227
  116. umap/static/umap/locale/pt_BR.json +18 -7
  117. umap/static/umap/locale/pt_PT.js +242 -227
  118. umap/static/umap/locale/pt_PT.json +18 -7
  119. umap/static/umap/locale/ro.js +242 -227
  120. umap/static/umap/locale/ro.json +18 -7
  121. umap/static/umap/locale/ru.js +242 -227
  122. umap/static/umap/locale/ru.json +18 -7
  123. umap/static/umap/locale/si.js +1 -1
  124. umap/static/umap/locale/si.json +1 -1
  125. umap/static/umap/locale/sk_SK.js +242 -227
  126. umap/static/umap/locale/sk_SK.json +18 -7
  127. umap/static/umap/locale/sl.js +242 -227
  128. umap/static/umap/locale/sl.json +18 -7
  129. umap/static/umap/locale/sr.js +242 -227
  130. umap/static/umap/locale/sr.json +18 -7
  131. umap/static/umap/locale/sv.js +242 -227
  132. umap/static/umap/locale/sv.json +18 -7
  133. umap/static/umap/locale/th_TH.js +242 -227
  134. umap/static/umap/locale/th_TH.json +18 -7
  135. umap/static/umap/locale/tr.js +242 -227
  136. umap/static/umap/locale/tr.json +18 -7
  137. umap/static/umap/locale/uk_UA.js +242 -227
  138. umap/static/umap/locale/uk_UA.json +18 -7
  139. umap/static/umap/locale/vi.js +242 -227
  140. umap/static/umap/locale/vi.json +18 -7
  141. umap/static/umap/locale/vi_VN.json +18 -7
  142. umap/static/umap/locale/zh.js +242 -227
  143. umap/static/umap/locale/zh.json +18 -7
  144. umap/static/umap/locale/zh_CN.json +18 -7
  145. umap/static/umap/locale/zh_TW.Big5.json +18 -7
  146. umap/static/umap/locale/zh_TW.js +242 -234
  147. umap/static/umap/locale/zh_TW.json +18 -7
  148. umap/static/umap/map.css +114 -265
  149. umap/static/umap/test/DataLayer.js +463 -0
  150. umap/static/umap/test/Feature.js +0 -226
  151. umap/static/umap/test/TableEditor.js +104 -0
  152. umap/static/umap/test/Util.js +0 -521
  153. umap/static/umap/test/index.html +0 -1
  154. umap/static/umap/unittests/URLs.js +1 -1
  155. umap/static/umap/unittests/utils.js +610 -0
  156. umap/static/umap/vars.css +9 -0
  157. umap/static/umap/vendors/dompurify/purify.es.mjs +1525 -0
  158. umap/static/umap/vendors/iconlayers/iconLayers.js +1 -1
  159. umap/templates/umap/css.html +2 -0
  160. umap/templates/umap/js.html +0 -1
  161. umap/templates/umap/map_detail.html +4 -0
  162. umap/templates/umap/map_table.html +12 -10
  163. umap/templatetags/umap_tags.py +5 -0
  164. umap/tests/integration/conftest.py +12 -1
  165. umap/tests/integration/test_anonymous_owned_map.py +6 -5
  166. umap/tests/integration/test_browser.py +12 -25
  167. umap/tests/integration/test_choropleth.py +1 -1
  168. umap/tests/integration/test_dashboard.py +10 -0
  169. umap/tests/integration/test_datalayer.py +8 -6
  170. umap/tests/integration/test_edit_datalayer.py +24 -19
  171. umap/tests/integration/test_edit_map.py +182 -2
  172. umap/tests/integration/test_edit_marker.py +120 -0
  173. umap/tests/integration/test_edit_polygon.py +122 -0
  174. umap/tests/integration/test_facets_browser.py +104 -14
  175. umap/tests/integration/test_import.py +70 -20
  176. umap/tests/integration/test_map.py +19 -17
  177. umap/tests/integration/test_map_list.py +28 -0
  178. umap/tests/integration/test_owned_map.py +10 -10
  179. umap/tests/integration/test_picto.py +5 -5
  180. umap/tests/integration/test_querystring.py +9 -15
  181. umap/tests/integration/test_slideshow.py +0 -5
  182. umap/tests/integration/test_statics.py +3 -2
  183. umap/tests/integration/test_tableeditor.py +1 -5
  184. umap/tests/integration/test_view_marker.py +64 -0
  185. umap/tests/integration/test_view_polygon.py +59 -0
  186. umap/tests/integration/test_view_polyline.py +51 -0
  187. umap/tests/test_map_views.py +13 -0
  188. {umap_project-2.1.3.dist-info → umap_project-2.2.0b0.dist-info}/METADATA +8 -8
  189. {umap_project-2.1.3.dist-info → umap_project-2.2.0b0.dist-info}/RECORD +194 -178
  190. umap/static/umap/vendors/dompurify/purify.min.js +0 -3
  191. umap/static/umap/vendors/dompurify/purify.min.js.map +0 -1
  192. /umap/tests/integration/{test_polygon.py → test_draw_polygon.py} +0 -0
  193. /umap/tests/integration/{test_polyline.py → test_draw_polyline.py} +0 -0
  194. {umap_project-2.1.3.dist-info → umap_project-2.2.0b0.dist-info}/WHEEL +0 -0
  195. {umap_project-2.1.3.dist-info → umap_project-2.2.0b0.dist-info}/entry_points.txt +0 -0
  196. {umap_project-2.1.3.dist-info → umap_project-2.2.0b0.dist-info}/licenses/LICENSE +0 -0
@@ -82,7 +82,6 @@
82
82
  "collapsed": "收起",
83
83
  "color": "色彩",
84
84
  "Comma separated list of numbers, including min and max values.": "用逗號分隔數字,包括最小與最大值。",
85
- "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)",
86
85
  "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。",
87
86
  "Comma separated list of properties to use when filtering features": "以逗號分開列出篩選時要使用的屬性",
88
87
  "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» 開頭的欄位資料,不分大小寫。其他欄位則歸入屬性資料。",
@@ -152,7 +151,6 @@
152
151
  "Dynamic properties": "動態屬性",
153
152
  "Dynamic": "動態",
154
153
  "Edit feature's layer": "編輯圖徵的圖層",
155
- "Edit map properties": "編輯地圖屬性",
156
154
  "Edit properties in a table": "在表格中編輯屬性",
157
155
  "Edit the title of the map": "編輯地圖標題",
158
156
  "Edit this feature": "編輯此圖徵",
@@ -165,7 +163,6 @@
165
163
  "Equidistant": "等距",
166
164
  "Error in the overlay URL": "套疊網址錯誤",
167
165
  "Error in the tilelayer URL": "地圖磚圖層 URL 錯誤",
168
- "Example: key1,key2,key3": "Example: key1,key2,key3",
169
166
  "Exit Fullscreen": "結束全螢幕模式",
170
167
  "expanded": "展開",
171
168
  "Extract shape to separate feature": "由外形分離出圖徵",
@@ -173,7 +170,6 @@
173
170
  "Facet search": "方面搜尋",
174
171
  "Feature identifier key": "Feature identifier key",
175
172
  "Feature properties": "圖徵屬性",
176
- "Features in this layer: {count}": "這個圖層的圖徵數:{count}",
177
173
  "Fetch data each time map view changes.": "每次地圖檢視改變時截取資料。",
178
174
  "fill color": "填入色彩",
179
175
  "fill opacity": "填入不透明度",
@@ -334,8 +330,7 @@
334
330
  "Search": "搜尋",
335
331
  "Secret edit link copied to clipboard!": "複製私密編輯連結到剪貼簿!",
336
332
  "Secret edit link:": "祕密編輯連結:",
337
- "See all": "觀看完整內容",
338
- "See data layers": "檢視資料圖層",
333
+ "See layers": "See layers",
339
334
  "See full screen": "觀看全螢幕",
340
335
  "See on OpenStreetMap": "在開放街圖檢視",
341
336
  "Select data": "Select data",
@@ -435,5 +430,21 @@
435
430
  "{distance} m": "{distance} 公尺",
436
431
  "{distance} miles": "{distance} 英哩",
437
432
  "{distance} NM": "{distance} 海浬",
438
- "{distance} yd": "{distance} 英呎"
433
+ "{distance} yd": "{distance} 英呎",
434
+ "Edit map name and caption": "Edit map name and caption",
435
+ "Map advanced properties": "Map advanced properties",
436
+ "Edit map details": "Edit map details",
437
+ "Back to browser": "Back to browser",
438
+ "Toggle size": "Toggle size",
439
+ "Layers": "Layers",
440
+ "Display the caption control": "Display the caption control",
441
+ "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.",
442
+ "<empty value>": "<empty value>",
443
+ "Min": "Min",
444
+ "Max": "Max",
445
+ "From": "From",
446
+ "Until": "Until",
447
+ "Example: key1,key2|Label 2,key3|Label 3|checkbox": "Example: key1,key2|Label 2,key3|Label 3|checkbox",
448
+ "Edit in OpenStreetMap": "Edit in OpenStreetMap",
449
+ "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns."
439
450
  }
umap/static/umap/map.css CHANGED
@@ -32,13 +32,13 @@
32
32
  }
33
33
  .leaflet-control-fullscreen a:hover,
34
34
  .leaflet-control-fullscreen a {
35
- height: 36px;
36
- width: 36px;
35
+ height: var(--control-size);
36
+ width: var(--control-size);
37
37
  background-size: 36px 68px;
38
38
  }
39
39
  .leaflet-touch .leaflet-control-fullscreen a {
40
- height: 36px;
41
- width: 36px;
40
+ height: var(--control-size);
41
+ width: var(--control-size);
42
42
  background-position: 0px 0px;
43
43
  }
44
44
  .leaflet-touch.leaflet-fullscreen-on .leaflet-control-fullscreen a,
@@ -52,9 +52,9 @@
52
52
  background-position: 50% 50%;
53
53
  background-repeat: no-repeat;
54
54
  display: block;
55
- height: 36px;
56
- width: 36px;
57
- line-height: 36px;
55
+ height: var(--control-size);
56
+ width: var(--control-size);
57
+ line-height: var(--control-size);
58
58
  background-image: url('./img/24.svg');
59
59
  text-indent: -9999px;
60
60
  margin-bottom: 0;
@@ -144,8 +144,8 @@
144
144
  color: #fff;
145
145
  background-image: none;
146
146
  border-radius: 20px;
147
- height: 36px;
148
- line-height: 36px;
147
+ height: var(--control-size);
148
+ line-height: var(--control-size);
149
149
  display: block;
150
150
  }
151
151
  .leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover,
@@ -287,14 +287,13 @@ ul.photon-autocomplete {
287
287
  .leaflet-control-toolbar > li > .leaflet-toolbar-icon,
288
288
  .umap-toolbar a,
289
289
  .umap-toolbar a:hover {
290
- height: 40px;
291
- width: 40px;
290
+ height: var(--control-size);
291
+ width: var(--control-size);
292
292
  display: none;
293
293
  margin-top: 0;
294
294
  vertical-align: top;
295
295
  border-bottom: none;
296
296
  background-color: var(--color-darkGray);
297
- border-right: 1px solid #eee;
298
297
  background-repeat: no-repeat;
299
298
  background-image: url('./img/24.svg');
300
299
  background-size: auto auto;
@@ -316,59 +315,6 @@ ul.photon-autocomplete {
316
315
  .manage-datalayers {
317
316
  background-position: -36px -72px;
318
317
  }
319
- .permissions-panel h3:before,
320
- .umap-browse-datalayers h3:before,
321
- .umap-edit-container h3:before,
322
- .umap-feature-properties:before,
323
- .umap-layer-properties-container h3:before,
324
- .umap-search h3:before,
325
- .umap-share h3:before,
326
- .umap-tilelayer-switcher-container h3:before,
327
- .umap-upload h3:before {
328
- height: 24px;
329
- width: 24px;
330
- background-repeat: no-repeat;
331
- background-image: url('./img/16-white.svg');
332
- background-size: auto auto;
333
- background-position: -98px -117px;
334
- content: " ";
335
- vertical-align: bottom;
336
- display: inline-block;
337
- }
338
- .umap-edit-container h3:before {
339
- background-position: -27px -93px;
340
- }
341
- .permissions-panel h3:before {
342
- background-position: -144px -117px;
343
- }
344
- .umap-upload h3:before {
345
- background-position: -144px -93px;
346
- }
347
- .umap-search h3:before {
348
- background-image: url('./img/16.svg');
349
- background-position: -27px -117px;
350
- }
351
- .umap-share h3:before {
352
- background-image: url('./img/16.svg');
353
- background-position: -4px -119px;
354
- }
355
- .dark .umap-tilelayer-switcher-container h3:before {
356
- background-image: url('./img/16-white.svg');
357
- background-position: -98px -141px;
358
- }
359
- .umap-tilelayer-switcher-container h3:before {
360
- background-image: url('./img/16.svg');
361
- background-position: -98px -141px;
362
- }
363
- .umap-feature-properties.marker:before {
364
- background-position: -72px -117px;
365
- }
366
- .umap-feature-properties.polyline:before {
367
- background-position: 0 -117px;
368
- }
369
- .umap-feature-properties.polygon:before {
370
- background-position: -24px -117px;
371
- }
372
318
  .umap-toolbar .update-map-permissions,
373
319
  .update-map-permissions {
374
320
  background-position: -36px -36px;
@@ -488,8 +434,8 @@ ul.photon-autocomplete {
488
434
  clear: both;
489
435
  }
490
436
  .umap-edit-actions li {
491
- height: 36px;
492
- line-height: 36px;
437
+ height: var(--control-size);
438
+ line-height: var(--control-size);
493
439
  cursor: pointer;
494
440
  margin-bottom: 5px;
495
441
  border-radius: 2px;
@@ -499,8 +445,8 @@ ul.photon-autocomplete {
499
445
  background-image: url('./img/24-white.svg');
500
446
  background-repeat: no-repeat;
501
447
  display: table-cell;
502
- width: 36px;
503
- height: 36px;
448
+ width: var(--control-size);
449
+ height: var(--control-size);
504
450
  }
505
451
  .umap-edit-actions li span {
506
452
  display: table-cell;
@@ -628,7 +574,7 @@ ul.photon-autocomplete {
628
574
  background-color: var(--color-darkGray);
629
575
  padding: 0 10px;
630
576
  text-align: left;
631
- line-height: 36px;
577
+ line-height: var(--control-size);
632
578
  cursor: auto;
633
579
  border-bottom: 1px solid #222;
634
580
  z-index: 1000;
@@ -713,7 +659,7 @@ ul.photon-autocomplete {
713
659
  display: inline-block; /* Prevents underline on hover. */
714
660
  }
715
661
  .umap-edit-enabled .leaflet-top {
716
- top: 48px;
662
+ top: 46px;
717
663
  }
718
664
  .umap-caption-bar-enabled .umap-caption-bar {
719
665
  display: block;
@@ -836,80 +782,15 @@ ul.photon-autocomplete {
836
782
  }
837
783
 
838
784
 
839
-
840
- /* ********************************* */
841
- /* Datalayers Control */
842
- /* ********************************* */
843
-
844
- .leaflet-control-browse .umap-browse-toggle {
845
- background-image: url('./img/24.svg');
846
- width: 36px;
847
- height: 36px;
848
- background-position: -36px -72px;
849
- background-size: 180px;
850
- }
851
- .leaflet-control-browse .umap-browse-actions {
852
- background-color: #fff;
853
- padding: 10px;
854
- display: none;
855
- line-height: 24px;
856
- border-radius: 2px;
857
- }
858
- .leaflet-control-browse .umap-browse-datalayers {
859
- max-height: 15em;
860
- overflow-y: auto;
861
- }
862
- .search-result-tools i,
863
- .leaflet-inplace-toolbar a,
864
- .umap-browse-features i,
865
- .umap-caption i,
866
- .umap-browse-datalayers i {
867
- background-repeat: no-repeat;
868
- background-image: url('./img/16.svg');
869
- display: inline;
870
- padding: 0 10px;
871
- cursor: pointer;
872
- height: 24px;
873
- line-height: 24px;
874
- vertical-align: middle;
875
- }
876
- .dark .umap-browse-datalayers i {
877
- background-image: url('./img/16-white.svg');
878
- }
879
- .umap-browse-datalayers li[draggable] .drag-handle {
880
- float: right;
881
- background-position: -72px -72px;
882
- margin-right: 5px;
883
- cursor: move;
884
- }
885
- .leaflet-inplace-toolbar a {
886
- background-image: url('./img/16-white.svg');
887
- background-color: var(--color-darkGray)!important;
888
- }
889
785
  .leaflet-toolbar-tip {
890
786
  background-color: var(--color-darkGray);
891
787
  }
892
- .leaflet-inplace-toolbar a:hover {
893
- background-color: #353c3e!important;
894
- }
895
- .leaflet-control-browse .umap-browse-datalayers .off i {
896
- cursor: inherit;
897
- }
898
788
  .layer-toggle {
899
789
  background-position: -49px -31px;
900
790
  }
901
791
  .off .layer-toggle {
902
792
  background-position: -73px -31px;
903
793
  }
904
- .feature-zoom_to {
905
- background-position: -1px -54px;
906
- }
907
- .layer-zoom_to {
908
- background-position: -1px -54px;
909
- }
910
- .layer-table-edit {
911
- background-position: -50px -1px;
912
- }
913
794
  .feature-delete,
914
795
  .layer-delete {
915
796
  background-position: -122px -49px;
@@ -921,17 +802,10 @@ ul.photon-autocomplete {
921
802
  .umap-toggle-edit {
922
803
  background-position: -44px -48px;
923
804
  }
924
- .readonly .layer-table-edit,
925
- .off .layer-table-edit {
926
- background-position: -74px -1px;
927
- }
928
805
  .readonly .layer-edit,
929
806
  .off .layer-edit {
930
807
  background-position: -50px -73px;
931
808
  }
932
- .off .layer-zoom_to {
933
- background-position: -25px -54px;
934
- }
935
809
  .readonly .layer-delete,
936
810
  .off .layer-delete {
937
811
  background-position: -122px -121px;
@@ -958,96 +832,108 @@ ul.photon-autocomplete {
958
832
  .umap-extract-shape-from-multi{
959
833
  background-position: -119px 2px;
960
834
  }
961
- .umap-browse-features .feature-title,
962
- .leaflet-control-browse .umap-browse-actions .layer-title {
835
+ .umap-browser .feature-title {
963
836
  width: inherit;
964
837
  cursor: inherit;
965
838
  padding-left: 6px;
966
839
  }
967
- .umap-browse-features .feature-title {
840
+ .umap-browser .feature-title {
968
841
  font-size: 12px;
969
842
  cursor: pointer;
970
843
  }
971
- .leaflet-control-browse .umap-browse-actions .off .layer-title {
972
- color: rgb(179, 179, 179);
844
+ .show-on-edit {
845
+ display: none!important;
973
846
  }
974
- .leaflet-control-browse.expanded > a,
975
- .leaflet-control-browse.expanded > button {
976
- display: none;
847
+ .umap-edit-enabled .show-on-edit {
848
+ display: inline-block!important;
977
849
  }
978
- .leaflet-control-browse.expanded .umap-browse-actions {
979
- display: block;
850
+ .umap-edit-enabled .show-on-edit.inline {
851
+ display: inline!important;
980
852
  }
981
- .leaflet-control-browse .umap-browse-link {
982
- background-image: none;
983
- background-color: rgb(68, 68, 68);
984
- color: white;
985
- display: block;
986
- height: 24px;
987
- line-height: 24px;
988
- margin-top: 14px;
989
- padding: 0 5px;
990
- text-align: right;
991
- min-width: 160px;
992
- width: 100%;
993
- border-radius: 2px;
853
+ .umap-edit-enabled .show-on-edit.block {
854
+ display: block!important;
994
855
  }
995
- a.add-datalayer:before,
996
- .leaflet-control-browse .umap-browse-link:before {
997
- background-image: url('./img/16.svg');
856
+ .umap-edit-enabled .hide-on-edit {
857
+ display: none!important;
858
+ }
859
+
860
+
861
+ /* ********************************* */
862
+ /* Browser panel */
863
+ /* ********************************* */
864
+ a.umap-control-browse,
865
+ .umap-control-browse [type="button"] {
866
+ background-position: -36px -72px;
867
+ }
868
+ a.umap-control-caption,
869
+ .umap-control-caption [type="button"] {
870
+ background-position: -72px -72px;
871
+ }
872
+ .leaflet-inplace-toolbar a {
998
873
  background-repeat: no-repeat;
999
- background-position: -45px -96px;
1000
- width: 24px;
874
+ background-image: url('./img/16.svg');
875
+ display: inline;
876
+ padding: 0 10px;
877
+ cursor: pointer;
1001
878
  height: 24px;
1002
- content: " ";
1003
- display: block;
1004
- float: left;
1005
- }
1006
- a.add-datalayer:before {
1007
- background-position: -20px -20px;
879
+ line-height: 24px;
880
+ vertical-align: middle;
1008
881
  }
1009
- a.add-datalayer:hover,
1010
- .leaflet-control-browse .umap-browse-link:hover {
1011
- background-color: rgb(99, 99, 99);
882
+ .umap-browser .datalayer i {
883
+ cursor: pointer;
1012
884
  }
1013
- .umap-browse-data .off .feature {
885
+ .umap-browser ul {
1014
886
  display: none;
1015
887
  }
888
+ .show-list ul {
889
+ display: block;
890
+ }
1016
891
 
1017
-
1018
- /* ********************************* */
1019
- /* Features browser panel */
1020
- /* ********************************* */
1021
-
892
+ .umap-browser .off .feature {
893
+ display: none;
894
+ }
1022
895
  .umap-facet-search .formbox,
1023
- .umap-browse-features > div {
1024
- border: 1px solid #d3d3d3;
1025
- margin-bottom: 14px;
896
+ .umap-browser .datalayer {
897
+ margin-bottom: 2px;
1026
898
  border-radius: 2px;
1027
899
  }
1028
- .umap-browse-features h5, .umap-facet-search h5 {
900
+ .umap-browser .datalayer ul {
901
+ border: 1px solid #d3d3d3;
902
+ }
903
+ .umap-browser.dark .datalayer ul {
904
+ border: 1px solid #232729;
905
+ }
906
+ .umap-browser h5, .umap-facet-search h5 {
1029
907
  margin-bottom: 0;
1030
908
  overflow: hidden;
1031
909
  padding-left: 5px;
1032
910
  height: 30px;
1033
911
  line-height: 30px;
1034
- background-color: #eeeee0;
1035
- color: #666;
912
+ background-color: var(--color-lightGray);
913
+ }
914
+ .umap-browser .off h5 {
915
+ color: #b3b3b3;
916
+ }
917
+ .umap-browser.dark h5 {
918
+ background-color: #232729;
919
+ color: white;
1036
920
  }
1037
- .umap-browse-features h5 span {
921
+ .umap-browser h5 span {
1038
922
  margin-left: 10px;
1039
923
  }
1040
- .umap-browse-features li, .umap-facet-search li {
924
+ .umap-browser li, .umap-facet-search li {
1041
925
  padding: 2px 0;
1042
926
  white-space: nowrap;
1043
927
  overflow: hidden;
1044
928
  text-overflow: ellipsis;
1045
929
  }
1046
- .umap-facet-search li:nth-child(even),
1047
- .umap-browse-features li:nth-child(even) {
1048
- background-color: #f8f8f3;
930
+ .umap-browser .datalayer li:nth-child(even) {
931
+ background-color: #efefef;
932
+ }
933
+ .umap-browser.dark .datalayer li:nth-child(even) {
934
+ background-color: #2c3233;
1049
935
  }
1050
- .umap-browse-features .feature-color {
936
+ .umap-browser .datalayer .feature-color {
1051
937
  box-shadow: 0 0 2px 0 black inset;
1052
938
  cursor: inherit;
1053
939
  -moz-box-sizing:border-box;
@@ -1060,62 +946,45 @@ a.add-datalayer:hover,
1060
946
  text-align: center;
1061
947
  margin-left: 5px;
1062
948
  }
1063
- .umap-browse-features .feature-color img {
949
+ .umap-browser.dark .datalayer .feature-color {
950
+ box-shadow: 0 0 2px 0 #999 inset;
951
+ }
952
+ .umap-browser .datalayer .feature-color img {
1064
953
  width: 24px;
1065
954
  }
1066
- .umap-browse-features .feature-color span {
955
+ .umap-browser .datalayer .feature-color span {
1067
956
  font-style: normal;
1068
957
  font-weight: bold;
1069
958
  }
1070
- .umap-browse-features .polygon .feature-color,
1071
- .umap-browse-features .polyline .feature-color {
959
+ .umap-browser .polygon .feature-color,
960
+ .umap-browser .polyline .feature-color {
1072
961
  box-shadow: 0 0 2px 0 black inset;
1073
962
  background-image: url('./img/24.svg');
1074
963
  background-size: 500%;
1075
964
  }
1076
- .umap-browse-features .polyline .feature-color {
965
+ .umap-browser .polyline .feature-color {
1077
966
  background-position: -72px -23px;
1078
967
  }
1079
- .umap-browse-features .polygon .feature-color {
968
+ .umap-browser .polygon .feature-color {
1080
969
  background-position: -48px -25px;
1081
970
  }
1082
- .show-on-edit {
1083
- display: none!important;
1084
- }
1085
- .umap-edit-enabled .show-on-edit {
1086
- display: inline-block!important;
1087
- }
1088
- .umap-edit-enabled .show-on-edit.inline {
1089
- display: inline!important;
1090
- }
1091
- .umap-edit-enabled .show-on-edit.block {
1092
- display: block!important;
1093
- }
1094
- .umap-browse-description {
1095
- font-size: 0.9em;
1096
- margin-bottom: 14px;
1097
- }
1098
- .datalayer-counter {
971
+ .umap-browser .datalayer-toggle-list {
1099
972
  float: right;
1100
973
  margin-right: 5px;
974
+ background-position: -145px -70px;
975
+ }
976
+ .umap-browser .show-list .datalayer-toggle-list {
977
+ background-position: -145px -45px;
978
+ }
979
+ .datalayer-name {
980
+ cursor: pointer;
1101
981
  }
1102
982
 
1103
983
 
1104
984
  /* ********************************* */
1105
985
  /* Table Editor */
1106
986
  /* ********************************* */
1107
- #umap-ui-container.umap-table-editor {
1108
- padding-left: 0;
1109
- padding-right: 0;
1110
- }
1111
- #umap-ui-container.umap-table-editor .toolbox li {
1112
- float: left;
1113
- }
1114
987
 
1115
- .umap-table-editor .umap-close-link {
1116
- right: auto;
1117
- left: 20px;
1118
- }
1119
988
  .umap-table-editor .table {
1120
989
  display: table;
1121
990
  width: 100%;
@@ -1170,33 +1039,6 @@ a.add-datalayer:hover,
1170
1039
  .umap-table-editor .thead .tcell:hover span {
1171
1040
  display: none;
1172
1041
  }
1173
- .remotelayer .layer-table-edit {
1174
- display: none !important;
1175
- }
1176
-
1177
- /* ********************************* */
1178
- /* Icons */
1179
- /* ********************************* */
1180
- .umap-icon-16 {
1181
- background-repeat: no-repeat;
1182
- background-image: url('./img/16.svg');
1183
- display: inline-block;
1184
- height: 20px;
1185
- padding: 0 10px;
1186
- vertical-align: middle;
1187
- }
1188
- .umap-add {
1189
- background-position: -28px -27px;
1190
- }
1191
- .umap-list {
1192
- background-position: -28px -99px;
1193
- }
1194
- .umap-list-white {
1195
- background-position: -92px -168px;
1196
- }
1197
- .umap-caption {
1198
- background-position: -99px -28px;
1199
- }
1200
1042
 
1201
1043
  /* ********************************* */
1202
1044
  /* Tilelayer switcher */
@@ -1659,9 +1501,9 @@ span.popup-icon {
1659
1501
  /* *************************** */
1660
1502
 
1661
1503
  .leaflet-control-zoom a, .leaflet-control-zoom a:hover {
1662
- height: 36px;
1663
- width: 36px;
1664
- line-height: 36px;
1504
+ height: var(--control-size);
1505
+ width: var(--control-size);
1506
+ line-height: var(--control-size);
1665
1507
  }
1666
1508
  .leaflet-container .leaflet-control-zoom {
1667
1509
  margin-left: 10px;
@@ -1741,13 +1583,20 @@ span.popup-icon {
1741
1583
  .leaflet-inplace-toolbar {
1742
1584
  z-index: 10000!important;
1743
1585
  }
1586
+ .leaflet-inplace-toolbar a {
1587
+ background-image: url('./img/16-white.svg');
1588
+ background-color: var(--color-darkGray)!important;
1589
+ }
1590
+ .leaflet-inplace-toolbar a:hover {
1591
+ background-color: #353c3e!important;
1592
+ }
1744
1593
  .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {
1745
1594
  border-width: 1px;
1746
1595
  }
1747
1596
  .leaflet-touch .leaflet-bar a {
1748
- width: 36px;
1749
- height: 36px;
1750
- line-height: 34px;
1597
+ width: var(--control-size);
1598
+ height: var(--control-size);
1599
+ line-height: var(--control-size);
1751
1600
  }
1752
1601
  /* Links are blue by default */
1753
1602
  .leaflet-container a {