umap-project 2.8.0__py3-none-any.whl → 2.8.0a0__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.
- umap/__init__.py +1 -1
- umap/locale/en/LC_MESSAGES/django.po +13 -13
- umap/management/commands/empty_trash.py +2 -5
- umap/management/commands/migrate_to_S3.py +3 -3
- umap/settings/base.py +2 -2
- umap/static/umap/css/form.css +0 -3
- umap/static/umap/js/modules/data/features.js +4 -19
- umap/static/umap/js/modules/data/layer.js +19 -41
- umap/static/umap/js/modules/importer.js +20 -65
- umap/static/umap/js/modules/rendering/icon.js +1 -2
- umap/static/umap/js/modules/rendering/map.js +7 -7
- umap/static/umap/js/modules/rendering/popup.js +10 -9
- umap/static/umap/js/modules/rendering/template.js +9 -53
- umap/static/umap/js/modules/rendering/ui.js +2 -6
- umap/static/umap/js/modules/request.js +2 -2
- umap/static/umap/js/modules/schema.js +0 -1
- umap/static/umap/js/modules/ui/dialog.js +0 -5
- umap/static/umap/js/modules/umap.js +10 -33
- umap/static/umap/js/modules/utils.js +0 -2
- umap/static/umap/js/umap.controls.js +4 -7
- umap/static/umap/js/umap.forms.js +0 -44
- umap/static/umap/locale/en.js +1 -3
- umap/static/umap/locale/en.json +1 -3
- umap/static/umap/locale/fr.js +1 -3
- umap/static/umap/locale/fr.json +1 -3
- umap/static/umap/map.css +166 -34
- umap/static/umap/vars.css +1 -0
- umap/storage.py +216 -0
- umap/templates/base.html +0 -2
- umap/templates/umap/components/alerts/alert.html +0 -4
- umap/templates/umap/css.html +0 -3
- umap/templates/umap/js.html +0 -2
- umap/templates/umap/map_init.html +0 -2
- umap/templates/umap/user_dashboard.html +0 -2
- umap/tests/integration/test_edit_datalayer.py +0 -11
- umap/tests/integration/test_import.py +1 -20
- umap/tests/test_datalayer_s3.py +1 -1
- umap/tests/test_statics.py +1 -1
- umap/tests/test_team_views.py +1 -35
- umap/tests/test_views.py +74 -0
- umap/views.py +15 -20
- {umap_project-2.8.0.dist-info → umap_project-2.8.0a0.dist-info}/METADATA +1 -1
- {umap_project-2.8.0.dist-info → umap_project-2.8.0a0.dist-info}/RECORD +46 -52
- umap/settings/local_s3.py +0 -45
- umap/storage/__init__.py +0 -3
- umap/storage/fs.py +0 -101
- umap/storage/s3.py +0 -61
- umap/storage/staticfiles.py +0 -64
- umap/tests/fixtures/test_upload_simple_marker.json +0 -19
- umap/tests/test_dashboard.py +0 -82
- {umap_project-2.8.0.dist-info → umap_project-2.8.0a0.dist-info}/WHEEL +0 -0
- {umap_project-2.8.0.dist-info → umap_project-2.8.0a0.dist-info}/entry_points.txt +0 -0
- {umap_project-2.8.0.dist-info → umap_project-2.8.0a0.dist-info}/licenses/LICENSE +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
umap/__init__.py,sha256=
|
|
1
|
+
umap/__init__.py,sha256=2KCwAhPAdl9iGZ4OqB3b9x9oEMjwYBXpF7OB99CO7m8,20
|
|
2
2
|
umap/admin.py,sha256=LoQytPGK6pLBqZ5QgQ9DIPAxhTG31cTtHOCqO9BY5S4,2645
|
|
3
3
|
umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
|
|
4
4
|
umap/asgi.py,sha256=CuVSNBwNb4AvuaD_Ha3ehtvf-c46ijZoVOSoP6WhXp8,432
|
|
@@ -10,9 +10,10 @@ umap/forms.py,sha256=fonoSwA02LawR7kXbjEZCH0ZYi53fAbRHYgW2RaqeYw,3803
|
|
|
10
10
|
umap/managers.py,sha256=-lBK0xYFRDfX76qDRdLnZOA8jEPYseEwIj8QOiHVM4w,243
|
|
11
11
|
umap/middleware.py,sha256=p8EPW_gYW8Wh2lk0DNIAkZQbYlBZugW7Yq4iiA7L4aE,514
|
|
12
12
|
umap/models.py,sha256=4SzhKdyWXfJMdzEpCyVPnzbTT-TGbDusAy7SP_8UuwI,17929
|
|
13
|
+
umap/storage.py,sha256=kEzS0BP9jrfVwlUtmEcf4W0t-7uEBqFfgKBlKvQTRVg,7900
|
|
13
14
|
umap/urls.py,sha256=LA3zxyu-GDo8kVqdyU7_bdbDGhDJV8_yFW4oEPTXw4s,7559
|
|
14
15
|
umap/utils.py,sha256=19i8ibi-1IXxafT4k_yOHMhD-DsPH74Ll9qw-UrUkM4,5856
|
|
15
|
-
umap/views.py,sha256=
|
|
16
|
+
umap/views.py,sha256=xSKBdbRFtoA0RXm5qCrVAoir4gm0_rN7d-70Nzbg0pQ,46016
|
|
16
17
|
umap/websocket_server.py,sha256=D9sTHhKg0DG37b8bw7KWTKMDc6TPyTkNLCVkh2mlFOo,6604
|
|
17
18
|
umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
|
|
18
19
|
umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
|
|
@@ -37,7 +38,7 @@ umap/locale/de/LC_MESSAGES/django.po,sha256=kVaio9t9AKF3vBcZJ-Q2P6Ua90MIwbIRCABW
|
|
|
37
38
|
umap/locale/el/LC_MESSAGES/django.mo,sha256=bJOH3_UQZoEfYi9mrsWHZfV6fVhMgnuiNQ_Dc_xOcuA,15058
|
|
38
39
|
umap/locale/el/LC_MESSAGES/django.po,sha256=ruqAlyQryr7Ip5aTbjEwH6eumb_b8JS-u6qcl9yjN04,22180
|
|
39
40
|
umap/locale/en/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
|
|
40
|
-
umap/locale/en/LC_MESSAGES/django.po,sha256=
|
|
41
|
+
umap/locale/en/LC_MESSAGES/django.po,sha256=RCM-hylLym43OQaDWCABqnHAyip57gwj4P_UNfyr3oU,13627
|
|
41
42
|
umap/locale/es/LC_MESSAGES/django.mo,sha256=rblKBhki-DnIAVxbo2UCYQCIte1dqRZDyAjDQCJgKug,11985
|
|
42
43
|
umap/locale/es/LC_MESSAGES/django.po,sha256=E0xSceHtg4CkgSHT2mFPRdiBP9n8c-PnKDXHQgAgStA,18690
|
|
43
44
|
umap/locale/et/LC_MESSAGES/django.mo,sha256=Y5ulivMuS2IOR9ITeWRx6PBynPn6LBFUizrFWRraR1s,5051
|
|
@@ -114,10 +115,10 @@ umap/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
|
114
115
|
umap/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
115
116
|
umap/management/commands/anonymous_edit_url.py,sha256=hsWgPzZJmLCoDKTWziFUuwq-DdnSiXkSal2t2TIED-s,1070
|
|
116
117
|
umap/management/commands/clean_tilelayer.py,sha256=Rcc2PibUUreU0jUZMtUlyqVvgbQMLMuuCZ2tkrzRqHU,5712
|
|
117
|
-
umap/management/commands/empty_trash.py,sha256=
|
|
118
|
+
umap/management/commands/empty_trash.py,sha256=guGnu72EYOiRtS-pLjxByFOmFtq1Ra0JR0SWBOZDOsY,1024
|
|
118
119
|
umap/management/commands/generate_js_locale.py,sha256=wkf-PFIHS7m4ZhyL1ZRMBLqyUeY2SlOrTXS42tE0-bs,1281
|
|
119
120
|
umap/management/commands/import_pictograms.py,sha256=RuQDCoiKamba4l3fZUGAXRyd-3zwWWT5c5AhgDvs7AQ,2369
|
|
120
|
-
umap/management/commands/migrate_to_S3.py,sha256
|
|
121
|
+
umap/management/commands/migrate_to_S3.py,sha256=-LVbLdr554mjhdSty1OE_33OI4CjdegqQZr2Fw2JeSk,1119
|
|
121
122
|
umap/management/commands/run_websocket_server.py,sha256=TyECJWnmZ95KpVEWSaqfXywz5VwIEzPdypU2d6V541c,648
|
|
122
123
|
umap/migrations/0001_initial.py,sha256=dMcXtTKPiA0IqXCrDVctH91Fe0hhc04NxmvcLAULyzE,8787
|
|
123
124
|
umap/migrations/0002_tilelayer_tms.py,sha256=E99JAu1K0NzwsCEJs1z5uGlBkBJmoVb9a3WBKjpLYlo,372
|
|
@@ -146,10 +147,9 @@ umap/migrations/0024_alter_map_share_status.py,sha256=QRjERy2XN0jsc8MM5cCba5freq
|
|
|
146
147
|
umap/migrations/0025_alter_datalayer_geojson.py,sha256=958v9AkpkAR5Q78ZcHC0fgZzN05BdfQwtNvUuPmWEvI,563
|
|
147
148
|
umap/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
148
149
|
umap/settings/__init__.py,sha256=aPJkOTk0uFusIBA-uOjdUi10R5Cxt4jl5yv2_uCTUvo,1702
|
|
149
|
-
umap/settings/base.py,sha256=
|
|
150
|
+
umap/settings/base.py,sha256=zdJa2Qqq1hlsFh80YFhOiNEs1cWa9ZAE5zzygpmHgKE,11082
|
|
150
151
|
umap/settings/dev.py,sha256=pj1mpmZXiI2syW8pB01wcVeqCFABF3V-nlOxArir4cw,386
|
|
151
152
|
umap/settings/local.py.sample,sha256=wpnoe7qtXer_xBuhWbcbqcSCotTJRu6h8hG7N-sD0b4,3157
|
|
152
|
-
umap/settings/local_s3.py,sha256=tunaCRn_I7P0IZH-UJpB1I5ft2kE0ZIBY8GYZeLYyfM,1387
|
|
153
153
|
umap/static/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
154
154
|
umap/static/umap/base.css,sha256=oUvs6YBtFZCgOEk7tVhnlkooORFZ5e1I9qSFGNeBrlw,3771
|
|
155
155
|
umap/static/umap/bitbucket.png,sha256=Z-xsnM3QOUn9tJQ0RjPXCpALghrzaDDZP7wSePSjSr8,9125
|
|
@@ -157,16 +157,16 @@ umap/static/umap/content.css,sha256=04_50AU8iF26_979Ds0sMby4LlKIpm3J08zsv1-blIY,
|
|
|
157
157
|
umap/static/umap/font.css,sha256=fYmTKNd_Ts6TrmBbnLRgyeUS4vpfxkEqhLR-pkd3KrA,904
|
|
158
158
|
umap/static/umap/github.png,sha256=Yiw6VX71qO87vNgJaDuirn3JVlUwrzIpkT9vbtROg1o,1564
|
|
159
159
|
umap/static/umap/keycloak.png,sha256=K-23F1dda0wD_39dXN5KmGqmgFvde6baNiZ8gdk0NyY,16598
|
|
160
|
-
umap/static/umap/map.css,sha256=
|
|
160
|
+
umap/static/umap/map.css,sha256=thD4iHeGokMMbMKXj-QFlSwyyjZh5YHSSqUUR8Ts2EM,28473
|
|
161
161
|
umap/static/umap/nav.css,sha256=IKB8Ga8TRal8naxjsgrcrnCO2eaKUL3YNofJB9IN9l0,1865
|
|
162
162
|
umap/static/umap/openstreetmap.png,sha256=xccBb_RsN7uchm7fRowVLjrzmCtj1-1PLByurkdjcr8,19408
|
|
163
163
|
umap/static/umap/theme.css,sha256=gkbyghlT5kNfz0Qyg1JL7xalqvHVx321eO9qlnvcaAU,49
|
|
164
164
|
umap/static/umap/twitter.png,sha256=BnVH7PcYlgKW56KHSOMRPevji2DvhJmvzFjl3-iF7c0,3225
|
|
165
|
-
umap/static/umap/vars.css,sha256=
|
|
165
|
+
umap/static/umap/vars.css,sha256=ckkSD9F7D9-IM8P-6qnU8CAxIPS6yq-rNQnzsoofUPo,1856
|
|
166
166
|
umap/static/umap/css/bar.css,sha256=u40xqJQtYgBDfhdELlXxkh9kPmn7T2pMEJQWeiG6EvA,4851
|
|
167
167
|
umap/static/umap/css/contextmenu.css,sha256=AdPajFTy2M_yHbkMKDYdh45gRO4amNd0OXRYYDNZSI4,437
|
|
168
168
|
umap/static/umap/css/dialog.css,sha256=9qwy9rOcTQY6SPkteM7dW1t36XQBJVoGETQatSOvffM,879
|
|
169
|
-
umap/static/umap/css/form.css,sha256=
|
|
169
|
+
umap/static/umap/css/form.css,sha256=CPBhU9tXuHeo6yng68v1LQcTEfsdM3nv2VNCWMYW3QM,13589
|
|
170
170
|
umap/static/umap/css/icon.css,sha256=-lFltPt6bgAhzXPWqYW97JTY3Y22dbR7KXoOmLZQiU8,4328
|
|
171
171
|
umap/static/umap/css/importers.css,sha256=iS3krkVPpqUQlPNQXSyByyho7rHBzxYqm04bPyKo_qY,1455
|
|
172
172
|
umap/static/umap/css/panel.css,sha256=fRPw-dyrcRegoOxTOWTDjBwuI_aHNPmmBOY16flsCBI,3073
|
|
@@ -222,9 +222,9 @@ umap/static/umap/img/source/16-white.svg,sha256=0xOMZOwpZW72QHt4SPao4BEr2lE6kZvW
|
|
|
222
222
|
umap/static/umap/img/source/16.svg,sha256=r3ZFL-rjyozbiboXDQOkoCLHW-0LTQa4Di9qF7z7qV0,44441
|
|
223
223
|
umap/static/umap/img/source/24-white.svg,sha256=t5713m3RdG9vunV2nUhLY4o4xT9v7ke3NY42g9FeAnE,29206
|
|
224
224
|
umap/static/umap/img/source/24.svg,sha256=2HY-QmZc2_eV3TyqGLlzqgJXCLVbrzKQV5Q6JLWgNiI,38319
|
|
225
|
-
umap/static/umap/js/umap.controls.js,sha256=
|
|
225
|
+
umap/static/umap/js/umap.controls.js,sha256=gY3ej4xzkrFsaySkUD_bYXcaSKLgFN6P_e65cDch8hE,29947
|
|
226
226
|
umap/static/umap/js/umap.core.js,sha256=FGx6GVcfrE_sn_izOt5r4DLkbO3-bv28jeXV8kwwUio,7029
|
|
227
|
-
umap/static/umap/js/umap.forms.js,sha256=
|
|
227
|
+
umap/static/umap/js/umap.forms.js,sha256=X0aTpmG5D2z-bSuD_Rpw73hx3o8Zz7d7qfBuvTpnYW4,31978
|
|
228
228
|
umap/static/umap/js/components/base.js,sha256=gDb1fGuNCC1KEu4PlQflC1PDNyrulhqLhmlsjyCJpps,1575
|
|
229
229
|
umap/static/umap/js/components/fragment.js,sha256=-rOrcyPpZ5ihD_hh0C1qrYpaim11JYh5fg0x_od_m5U,379
|
|
230
230
|
umap/static/umap/js/components/alerts/alert.css,sha256=fSmbDDjXjEYLfgnEAVDhyqWiBOUy2YhVRy0_den-7Dk,4930
|
|
@@ -238,32 +238,32 @@ umap/static/umap/js/modules/formatter.js,sha256=drbIxbDGrcHOUtzJtC4B5iKpm8-YNg_b
|
|
|
238
238
|
umap/static/umap/js/modules/global.js,sha256=7jm6NLZ5PM2yrkbWHdWkoDFcevgIAMqE-vZQRXcIgEo,934
|
|
239
239
|
umap/static/umap/js/modules/help.js,sha256=0vsDTFGcPz2coG_LBeGPSUQupZTFUes6kCwQCPBUjuU,9694
|
|
240
240
|
umap/static/umap/js/modules/i18n.js,sha256=dEpjsWoEZa-Tr5_MDO0tuWkt7kLL3crxXqhttyP-khU,1387
|
|
241
|
-
umap/static/umap/js/modules/importer.js,sha256=
|
|
241
|
+
umap/static/umap/js/modules/importer.js,sha256=hfFXTXtyCueeEZrs-cq6EAnicgRANzijbhoihYFT-RE,10000
|
|
242
242
|
umap/static/umap/js/modules/leaflet-configure.js,sha256=P3aD8iNGxuVNv-xW4Di4txAjNmnlpKtCCzDvPaKEdQ8,243
|
|
243
243
|
umap/static/umap/js/modules/orderable.js,sha256=zDtcElZ_MVPoGba8Iv9bxOzk4vuN7C-5XVl4UomDYHE,2521
|
|
244
244
|
umap/static/umap/js/modules/permissions.js,sha256=RxKrfjLo6hdGuAvwQrzUUJJznD5RkmSkAHVMidA9iKQ,8497
|
|
245
|
-
umap/static/umap/js/modules/request.js,sha256=
|
|
245
|
+
umap/static/umap/js/modules/request.js,sha256=hMy3dleGRxstKsksbNa15w7jk4H9-nAV_ub-JdNhDD8,3881
|
|
246
246
|
umap/static/umap/js/modules/rules.js,sha256=z_QmGH5HdS1HVtJXBjQsGkz7kus_E2NocZAqaP7BN1g,7433
|
|
247
247
|
umap/static/umap/js/modules/saving.js,sha256=oO6S23KldT19e3xM_iupw0ZDruyyCNHBx5e5wtrejhI,689
|
|
248
|
-
umap/static/umap/js/modules/schema.js,sha256=
|
|
248
|
+
umap/static/umap/js/modules/schema.js,sha256=RuBO5obpccTPH_iPXRU-lwyj1SoX9bp619tknrPiZjI,13141
|
|
249
249
|
umap/static/umap/js/modules/share.js,sha256=s1X59VpMqut_Vhg7l7LV2IZDm9obRVbDH9wZbG5kX3c,7182
|
|
250
250
|
umap/static/umap/js/modules/slideshow.js,sha256=zcRzOMkJvhps1npGRjHkdK4Ce3UkqOsv8OsDgQWO-bg,3567
|
|
251
251
|
umap/static/umap/js/modules/tableeditor.js,sha256=6p2YE2-NF4NkwLDQkqrl90P_PwOYdFao0-ac_AkOwWs,9854
|
|
252
|
-
umap/static/umap/js/modules/umap.js,sha256=
|
|
252
|
+
umap/static/umap/js/modules/umap.js,sha256=n509OKscghGTM_sXlvcobVdJG36NRpeQA5pIlmEaUDI,49989
|
|
253
253
|
umap/static/umap/js/modules/urls.js,sha256=76cFqycj2O8huuoYYBvxnVt2Fc2UDbgrRsiv6lQmcSY,890
|
|
254
|
-
umap/static/umap/js/modules/utils.js,sha256=
|
|
255
|
-
umap/static/umap/js/modules/data/features.js,sha256=
|
|
256
|
-
umap/static/umap/js/modules/data/layer.js,sha256=
|
|
254
|
+
umap/static/umap/js/modules/utils.js,sha256=fYzo-WjRzDZsdjv3CI9U4Es3AqOfuBCJuRq997m2EfQ,12309
|
|
255
|
+
umap/static/umap/js/modules/data/features.js,sha256=rd5WpZoai3u4baWxi_8m2vtwGLuI-9hdH4PGnrjqg_4,31667
|
|
256
|
+
umap/static/umap/js/modules/data/layer.js,sha256=WhB0ZSaNpI082JKL28EYLjY2fhoIXdOhMwn8JDuqtqM,34530
|
|
257
257
|
umap/static/umap/js/modules/importers/cadastrefr.js,sha256=KHqxHleFRFzNi98gegvUM1R6eJorAGGcMft_ktUg-ug,2262
|
|
258
258
|
umap/static/umap/js/modules/importers/communesfr.js,sha256=6q6ilmYhhuSmgdrvfTyEDNyMLbc9J9Bt8VMZVXB8ZOA,1723
|
|
259
259
|
umap/static/umap/js/modules/importers/datasets.js,sha256=StZbRiq_1vqe0OO1w66k5Lwzju8RntmHpWe9HWIDfRE,1372
|
|
260
260
|
umap/static/umap/js/modules/importers/geodatamine.js,sha256=vIxANzNc1TAe3QcZroIxqNvos1vexBmKDTtzErBNiY4,2949
|
|
261
261
|
umap/static/umap/js/modules/importers/overpass.js,sha256=cY2kb3Fs8tA6PqBjGyc5bI0mg7L1ijapIAkVGwEhSwI,3341
|
|
262
|
-
umap/static/umap/js/modules/rendering/icon.js,sha256=
|
|
263
|
-
umap/static/umap/js/modules/rendering/map.js,sha256=
|
|
264
|
-
umap/static/umap/js/modules/rendering/popup.js,sha256=
|
|
265
|
-
umap/static/umap/js/modules/rendering/template.js,sha256=
|
|
266
|
-
umap/static/umap/js/modules/rendering/ui.js,sha256=
|
|
262
|
+
umap/static/umap/js/modules/rendering/icon.js,sha256=hguSJt3wDqe0oSQIm1zrYSbyktKVQUWv-QTo5fYdlc8,7861
|
|
263
|
+
umap/static/umap/js/modules/rendering/map.js,sha256=rmI6Y6HHWxWVNokhXl0ADkQDoHzJda5KRdrIZGWrzKI,12956
|
|
264
|
+
umap/static/umap/js/modules/rendering/popup.js,sha256=EHfOSPb8BmbGK6-DcGekfbIDpNjH-y8L2QnpfbJEr3Y,2604
|
|
265
|
+
umap/static/umap/js/modules/rendering/template.js,sha256=LRLhU8kKoZpvyPR2h1E3XyfS4BY07p3b82KPZPk5rbU,7890
|
|
266
|
+
umap/static/umap/js/modules/rendering/ui.js,sha256=KmAoFiLjiA6IqWzn8gK4U7H_361aAIXZjNWVgnxm_go,14323
|
|
267
267
|
umap/static/umap/js/modules/rendering/layers/base.js,sha256=DeXxRwTatoxxGStT1tWyNQVCrIkbgd7ZaawIPxWIcOQ,2525
|
|
268
268
|
umap/static/umap/js/modules/rendering/layers/classified.js,sha256=h4cKB4sZ05MTwlE_kur292HRHxdaSkuwIMmW5JaU-Ac,14679
|
|
269
269
|
umap/static/umap/js/modules/rendering/layers/cluster.js,sha256=970BbIdiOUQTdNRRRA_4sY2L-1fTe6wb0wBFeuHZxww,3368
|
|
@@ -275,7 +275,7 @@ umap/static/umap/js/modules/sync/websocket.js,sha256=1UtvsTAm-gkfpBRcLPykPvDyax3
|
|
|
275
275
|
umap/static/umap/js/modules/ui/bar.js,sha256=zoWNOKhs-Sf5pFTlPFoEAysS-AUF6ZlXdO5UA9jom2A,7570
|
|
276
276
|
umap/static/umap/js/modules/ui/base.js,sha256=8PN8TRIBqTANRufwVvV0XzOdaYQuRCnlWGbTGq8FZiM,2491
|
|
277
277
|
umap/static/umap/js/modules/ui/contextmenu.js,sha256=VzC94uGUt8DkzC60Gcbz-MxivfSITEqUC91Fkpq1gjk,2550
|
|
278
|
-
umap/static/umap/js/modules/ui/dialog.js,sha256=
|
|
278
|
+
umap/static/umap/js/modules/ui/dialog.js,sha256=Jh2jb4qjxx_eTGAU9cRZHwWhtyk2HFVg7dkP8eCtBLQ,5403
|
|
279
279
|
umap/static/umap/js/modules/ui/panel.js,sha256=phPWwCFxQ9AJ9auPPayD5Xtf6yQemQSZHlVlLANfTx0,3240
|
|
280
280
|
umap/static/umap/js/modules/ui/tooltip.js,sha256=M2KBb5CA4AvaA-6QgfpUKMYQuGXzTqx4ZVA9fkMRBEs,1642
|
|
281
281
|
umap/static/umap/locale/am_ET.js,sha256=TsgZgJkMMmFAJE0nJIq62r8hHvFgLLjcA6axXQlkbog,33822
|
|
@@ -298,8 +298,8 @@ umap/static/umap/locale/de.js,sha256=wUAKh3L1vhrHH819XeKeLalw8GOhjh5G-yErBUDY4R0
|
|
|
298
298
|
umap/static/umap/locale/de.json,sha256=cM1Q4WS2qCtQebyUHnHmblS4aj9j4TooDwk_nSQ8pqs,32723
|
|
299
299
|
umap/static/umap/locale/el.js,sha256=aK9fBOMEaQf-a3IU3lEhJ5qeDNRtHIR5k_WD0n09d88,41377
|
|
300
300
|
umap/static/umap/locale/el.json,sha256=G3O0k62tIsf654xUZO0x988aKIAo0zZCHzRibDxpjo8,41312
|
|
301
|
-
umap/static/umap/locale/en.js,sha256=
|
|
302
|
-
umap/static/umap/locale/en.json,sha256=
|
|
301
|
+
umap/static/umap/locale/en.js,sha256=3zFUHDjehyf1qhY9NcO3SkiTY0cdEinrpIOSez3upRw,30089
|
|
302
|
+
umap/static/umap/locale/en.json,sha256=9EbcClQgnn14besF7LctqoxAWPR4qvnRiMIoN3XeuHY,30024
|
|
303
303
|
umap/static/umap/locale/en_US.json,sha256=E8ScCCs3lXiHOJPqTNxd7maDyhkkF3GNqN-r2p27lLQ,29813
|
|
304
304
|
umap/static/umap/locale/es.js,sha256=xYnvTBRzycvrYhEA5yr8uFV8aeCoVLPsJegdccDdjQg,32933
|
|
305
305
|
umap/static/umap/locale/es.json,sha256=-JF4DZ5B4yk2Qvhj4FsEhZs0UybS0m0t2roH0cvnPXw,32868
|
|
@@ -311,8 +311,8 @@ umap/static/umap/locale/fa_IR.js,sha256=qn-Oc23zaIz_ua3DAvvVljn--jn2fR7eaMF-bsyp
|
|
|
311
311
|
umap/static/umap/locale/fa_IR.json,sha256=ql1IvgBcDHiAD6ho500PwRE2y8x9gSfsKq96IQgAZTw,38633
|
|
312
312
|
umap/static/umap/locale/fi.js,sha256=wyW-hHzNfKHoPKata6sw_TBx3Grz227eXscuabAGbwQ,30915
|
|
313
313
|
umap/static/umap/locale/fi.json,sha256=lDQ6_RxXtcNI_kahg8XBWlVYUE-MvgUqJA_Ue6DJj3c,30850
|
|
314
|
-
umap/static/umap/locale/fr.js,sha256=
|
|
315
|
-
umap/static/umap/locale/fr.json,sha256=
|
|
314
|
+
umap/static/umap/locale/fr.js,sha256=qcNce3E8OnRxRQwi8bRm9XhcixmTGtZrdEN-4fjcPSA,32978
|
|
315
|
+
umap/static/umap/locale/fr.json,sha256=RgemOdmvz98TVih78sXjhJ-D69KFE5xk12yr-75cMEo,32913
|
|
316
316
|
umap/static/umap/locale/gl.js,sha256=ninZHPi3xo8aatt9G6zBNXCX6br0Na7-t20JJT0XDX4,31478
|
|
317
317
|
umap/static/umap/locale/gl.json,sha256=b99nZnWgtOZf1Uj-WUCPnWLrcvg5IGDYCV0wc7ntgb8,31413
|
|
318
318
|
umap/static/umap/locale/he.js,sha256=jljbzL6uctwBN5fzwQM4lFZ6ZLXKzldUeDTyzQTSyqU,33381
|
|
@@ -449,13 +449,9 @@ umap/static/umap/vendors/tokml/tokml.es.js,sha256=BqL0WqFH5UZAh_S_265E6PWZjPMYxe
|
|
|
449
449
|
umap/static/umap/vendors/tokml/tokml.es.mjs.map,sha256=vw5JxZFh_2_xM1cHI51r1Bf48JaBKzNcR7ddgaaF8KY,45844
|
|
450
450
|
umap/static/umap/vendors/toolbar/leaflet.toolbar.css,sha256=5KVBOQ0ivsFuafKYvVm32wJ_fi7w8Li1-2Rwwcv85jA,2244
|
|
451
451
|
umap/static/umap/vendors/toolbar/leaflet.toolbar.js,sha256=HXh_bR49ZFpJ-GNXDNo2eHy-fJmrWehAzUeHgGhu__c,5326
|
|
452
|
-
umap/storage/__init__.py,sha256=Aj421eIsZhsu0B7zd5lTJufVYr0EtUkH0lTqpbBh8AU,85
|
|
453
|
-
umap/storage/fs.py,sha256=CdjnDe4UVMt_9Yp2uZqvtarfHTAYRed6Tid2UU-sBgY,3721
|
|
454
|
-
umap/storage/s3.py,sha256=KAYu3vAqXbd5UhaoPxG6zcGtBfKZOzzi-6uY6YEuIcY,1962
|
|
455
|
-
umap/storage/staticfiles.py,sha256=mxFcenC1JECmpNy4H0e7vX8GObDZVXzs1RPjQFWNd5k,2473
|
|
456
452
|
umap/templates/404.html,sha256=1yLlD8rSF_9cfjm5FYy--P46HLVbHeFkJiW9nRzM--E,399
|
|
457
453
|
umap/templates/500.html,sha256=Z8x47OVfYXquAYAlmRB0EJVTCiCaBppFFiFEmoYsMYY,5202
|
|
458
|
-
umap/templates/base.html,sha256=
|
|
454
|
+
umap/templates/base.html,sha256=_Q0Ikwese3vlUl0pKQdzHDy_oRT9OV4uWh0RGFaYAQA,1499
|
|
459
455
|
umap/templates/auth/user_detail.html,sha256=ud6AnM2ZK9WN8SuAnmKhZlGN0Wbi-GOzy09hoPfL04I,525
|
|
460
456
|
umap/templates/auth/user_form.html,sha256=h9NZi9KIC_5jkvj5KAsxX5CdiYCrQ2lrl9qpr5ObPcg,1730
|
|
461
457
|
umap/templates/auth/user_stars.html,sha256=LAGZU50ki2SCqZ0o_NBfN7T2RDl-L_1EGLixu5OH4AY,545
|
|
@@ -465,17 +461,17 @@ umap/templates/umap/about_summary.html,sha256=5pvCvX34YHk_XCtZfcRSznvRwi_-UJMioD
|
|
|
465
461
|
umap/templates/umap/branding.html,sha256=8IzkIWqiZckgkX9FC-n1v6f8JIB2q7DcX3JHscxsaYA,60
|
|
466
462
|
umap/templates/umap/content.html,sha256=KfNQ18LcbxFd00tHQeirGy5Vh75qQNM6pj0bQbcy4Bo,2246
|
|
467
463
|
umap/templates/umap/content_footer.html,sha256=wkdc4Usuq4-vDIJHPxv-KS6KL4gBkUl7ARyU7zz1Zis,1154
|
|
468
|
-
umap/templates/umap/css.html,sha256=
|
|
464
|
+
umap/templates/umap/css.html,sha256=kOo_21HmUKEfZk6rUtZaBbiidens27wDUH3fdYEoU-k,2266
|
|
469
465
|
umap/templates/umap/dashboard_menu.html,sha256=DEzGwiL_U1ntDpY0Ybda5ijDMSNw-n7Vb-V7HrsqYgo,688
|
|
470
466
|
umap/templates/umap/footer.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
471
467
|
umap/templates/umap/header.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
472
468
|
umap/templates/umap/home.html,sha256=021I4eVLjMWvhsIqo2k2FADXla2c4UClAJ1uy9R5KVI,839
|
|
473
|
-
umap/templates/umap/js.html,sha256=
|
|
469
|
+
umap/templates/umap/js.html,sha256=txh_b153ORSG9OSMxgQp9jbZHwtVoWWzt6fBFiIK7sE,2425
|
|
474
470
|
umap/templates/umap/locale.js,sha256=AP-mSJQq5RyC3eNaBbk-sOsD80r0_qlvuK1afXdsVo4,112
|
|
475
471
|
umap/templates/umap/login_popup_end.html,sha256=kcENvhycpVvvIzbNasX1rcSI_67A6pttkWCxy0vHC8g,693
|
|
476
472
|
umap/templates/umap/map_detail.html,sha256=xMOsbF7NWJ-mpShR0ciJ8MrTeG2OYDm8OIL0yHbW6eg,1192
|
|
477
473
|
umap/templates/umap/map_fragment.html,sha256=ZRIA3W2tuIecv2LtxyKNSW4k7PmCxRlFmI6TIKC1EV8,152
|
|
478
|
-
umap/templates/umap/map_init.html,sha256=
|
|
474
|
+
umap/templates/umap/map_init.html,sha256=rfx8IUol6YTQwBcyaYBEuFDvFzTtFqs5Jh1Yc5gdGbs,285
|
|
479
475
|
umap/templates/umap/map_list.html,sha256=Jb-VU3dQdRWsW80nyyRq1Eb6UrhAoIfGleu1cNMJKwc,673
|
|
480
476
|
umap/templates/umap/map_table.html,sha256=WrH86ybY_GzzRmALfON_oni9aFuIswgOtpTSJ5h8SEY,5778
|
|
481
477
|
umap/templates/umap/messages.html,sha256=liEsg-I26XHb0FOBAbzFsZl2RfNQtGt-HKoE6jHefbI,190
|
|
@@ -488,9 +484,9 @@ umap/templates/umap/success.html,sha256=3FG4yWwtdF3zvVWQ2ZAjCkgv0kcSNZlUjgYy_b-X
|
|
|
488
484
|
umap/templates/umap/team_confirm_delete.html,sha256=D4EKfuzVjAexHKPHRsSHpjuAjMNl0iCPtaW2NEGUk2A,448
|
|
489
485
|
umap/templates/umap/team_detail.html,sha256=4gd8YjvVqGysXNJtzAaZwOpBAADLzJ_ekFRPQp1sHYM,699
|
|
490
486
|
umap/templates/umap/team_form.html,sha256=yG_zxmJfEwLC5Mof-4SHYcx6lfkOjbGVusQGT7iqSNs,1922
|
|
491
|
-
umap/templates/umap/user_dashboard.html,sha256=
|
|
487
|
+
umap/templates/umap/user_dashboard.html,sha256=kMKk8YHDJkLzs9M9ZBMkrshnDtknrt2dn6OXQb3FeMw,2478
|
|
492
488
|
umap/templates/umap/user_teams.html,sha256=MfelqIwoLRVjvX-KpVtwqh0I7pNx3oDRhqmSRdpT4bs,1570
|
|
493
|
-
umap/templates/umap/components/alerts/alert.html,sha256=
|
|
489
|
+
umap/templates/umap/components/alerts/alert.html,sha256=eQRALES_PzIP3qs16eXq9SGz2KWODr4VY0tyl_hARCw,3482
|
|
494
490
|
umap/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
495
491
|
umap/templatetags/umap_tags.py,sha256=OumX1AI9uWzNP3zbjexTz7lGp10FweW0NRFSsdQ_cuU,1759
|
|
496
492
|
umap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -498,20 +494,19 @@ umap/tests/base.py,sha256=x9GVS5eAzc1CHyNxx5gd2w0AJCeHIr4nmX4yak8LhyM,4768
|
|
|
498
494
|
umap/tests/conftest.py,sha256=KQCZanCTl1ABLIKOuyxS_cpBoXGiwjDc29jsLBiSWxY,1633
|
|
499
495
|
umap/tests/settings.py,sha256=tY70LMFXyo_WijswqGyeWai7vBzM62k7IA8pkkbc9y4,816
|
|
500
496
|
umap/tests/test_clean_tilelayer.py,sha256=wGTd_AHOTmQ4QMswAyc-1_lJmQOSyhY3OahLAusEIdA,2515
|
|
501
|
-
umap/tests/test_dashboard.py,sha256=w9IgKdupP9JpixLqvNl6UKbglgFVN_dG_R9Zvw1SJy0,2880
|
|
502
497
|
umap/tests/test_datalayer.py,sha256=NWX7o-sLOrq3nHT0GDywz5vtJU4HJhZZh11r_rWxhVA,9539
|
|
503
|
-
umap/tests/test_datalayer_s3.py,sha256=
|
|
498
|
+
umap/tests/test_datalayer_s3.py,sha256=bqLpdQZLoL-jwD7HeqMXuLFUfnkP-xd6B6BBW7JFm0U,4145
|
|
504
499
|
umap/tests/test_datalayer_views.py,sha256=Fx_oQF3hBC2FVHTTjTScXbFS2d7FRKdBL7QFFexvKkg,22880
|
|
505
500
|
umap/tests/test_empty_trash.py,sha256=9dYdnQqzlfgkExQxiQDqQ4flKsPTZ97uB3te5wmZ0Nw,1112
|
|
506
501
|
umap/tests/test_licence.py,sha256=BxNY3gdKhIoc2u5OPmAkmjCp0jJN-Jm-uPOfAZlpOHA,339
|
|
507
502
|
umap/tests/test_map.py,sha256=vrtheSMQNk45kBIcJ0QY9K7HKYee5yg4Vnp78DyaIwQ,5170
|
|
508
503
|
umap/tests/test_map_views.py,sha256=EKLJnQ-xk_bkaJ6P7OJ2bnya5orbaSnWFV8GIYcjDNk,33823
|
|
509
504
|
umap/tests/test_merge_features.py,sha256=uLZSW00WAI8_nZS0KPP8gg8U4nnky-XGb-VhhKUxv1M,2275
|
|
510
|
-
umap/tests/test_statics.py,sha256=
|
|
511
|
-
umap/tests/test_team_views.py,sha256=
|
|
505
|
+
umap/tests/test_statics.py,sha256=WJe4DZ-cSfN_wCRD8U9ocl6v5FoXrVwBjU6kI6BOcmY,1252
|
|
506
|
+
umap/tests/test_team_views.py,sha256=vExhJ3c1cJ7vgxe0G20UzTKkzR5D2UgAapk09muUg5w,4481
|
|
512
507
|
umap/tests/test_tilelayer.py,sha256=toVpVutEvMLWKx5uH7ZbGNPGzqICZx1_S2OOpIfYPfQ,603
|
|
513
508
|
umap/tests/test_utils.py,sha256=noh-AFL3qV-dNZYr8L1acsYC02SI710Bq2ZXV-jBEzk,407
|
|
514
|
-
umap/tests/test_views.py,sha256=
|
|
509
|
+
umap/tests/test_views.py,sha256=R8uTHHbZmYcDFpzFiFhNod214v15GI1r1yVJmtqeu2E,18444
|
|
515
510
|
umap/tests/test_websocket_server.py,sha256=BQ9Sy5VC9kBAfPWVxqcXoi9yfq12nfNvBE_j5rTFk7w,696
|
|
516
511
|
umap/tests/fixtures/categorized_highway.geojson,sha256=p7QHOd8nXi7yVq37gY6Ca8BXkjaLnDxW9Fq0Zcm3Fk4,15830
|
|
517
512
|
umap/tests/fixtures/choropleth_region_chomage.geojson,sha256=mVVbYlf92Sr3wWH9ETm43FdHz1U3zjsn91HuU5H5r4Y,21325
|
|
@@ -531,7 +526,6 @@ umap/tests/fixtures/test_upload_empty_coordinates.json,sha256=-mJ_1orzUAROfE4PXc
|
|
|
531
526
|
umap/tests/fixtures/test_upload_georss.xml,sha256=lfmVA0qGDakCG48jjsLmSIE1U6iZ9yyFuqqX6Srt8Js,1160
|
|
532
527
|
umap/tests/fixtures/test_upload_missing_name.json,sha256=klSMHb6laTghzU4AdIG1_p5UZ1LbAJCCKnJea0qEFAI,4566
|
|
533
528
|
umap/tests/fixtures/test_upload_non_linear_ring.json,sha256=WOR0NnJHNUUW6VKzZyIxU7WL1llnAmEVJwCWla6XOds,1525
|
|
534
|
-
umap/tests/fixtures/test_upload_simple_marker.json,sha256=jH15G5PxgVO-DZb4TPxVMAi1_uzhkvZcFkVUb50CS3Q,393
|
|
535
529
|
umap/tests/integration/__init__.py,sha256=nqQ2miDnSZOKDuFhQ5saFN3qQuK73Cs6xL9Od-mEKG4,57
|
|
536
530
|
umap/tests/integration/conftest.py,sha256=OTKeDdLBpFUsqFCnHD-QY2X1iv5m4jIaE__4T4qKdDY,2468
|
|
537
531
|
umap/tests/integration/helpers.py,sha256=vvGX5b-DS2fMVDdeXz1lH2IleZkRHjyL7DVvatJU8Do,344
|
|
@@ -548,14 +542,14 @@ umap/tests/integration/test_dashboard.py,sha256=LClLBc8lgDM1-NGhkvUSUMLmMuKt3sR1
|
|
|
548
542
|
umap/tests/integration/test_datalayer.py,sha256=cxsf65noYTucEMLuUz8DfJ9abXHhAq0n65MvdBmBRVo,5492
|
|
549
543
|
umap/tests/integration/test_draw_polygon.py,sha256=Ub_1Witps_BLwMMmQ4M0vPIyQOEQ_Bq82znpJdWpCfY,25385
|
|
550
544
|
umap/tests/integration/test_draw_polyline.py,sha256=lPr5hz-wHL9oC2B3yveNHC-OxdzWvcf8fHMBZbXTuss,14801
|
|
551
|
-
umap/tests/integration/test_edit_datalayer.py,sha256=
|
|
545
|
+
umap/tests/integration/test_edit_datalayer.py,sha256=Q2y7IEd66f637pkjGYRs_EtFsfQJg40Dk-5ey44_LpA,9798
|
|
552
546
|
umap/tests/integration/test_edit_map.py,sha256=d76M4J6rumDQ6sKaOyTA45dWAkwAOtoUuNkW-GsA-fo,7134
|
|
553
547
|
umap/tests/integration/test_edit_marker.py,sha256=sj4n2mCYQ-qZ02jFHA566Wg_y9F6oXb1AxddnthSQHI,4746
|
|
554
548
|
umap/tests/integration/test_edit_polygon.py,sha256=JeIW6NcBltIl958uJ_T-0dRCT5gOo9JrNtULvg7nxf4,5286
|
|
555
549
|
umap/tests/integration/test_export_map.py,sha256=jH0BXm-7Ov26OEkve9-xKMfRwXwR73zRrZLIQusyUOY,12112
|
|
556
550
|
umap/tests/integration/test_facets_browser.py,sha256=J--y2rpI__0RIPzcTx4Kn2UwuurFdh-6i_Y4c6GxUyY,10658
|
|
557
551
|
umap/tests/integration/test_features_id_generation.py,sha256=e99_8AxeMAi53JjVGlsI32zlrXGAU19FHJfTuYdiBVQ,1511
|
|
558
|
-
umap/tests/integration/test_import.py,sha256=
|
|
552
|
+
umap/tests/integration/test_import.py,sha256=88ep2QaVJ26GF45dPIjwy9S3yCiVulZkTbEUYLDUPKA,30533
|
|
559
553
|
umap/tests/integration/test_map.py,sha256=2ZO54RFVycJKGczfioX0nU1oCu29FVC9hR6wbT4s1NE,8736
|
|
560
554
|
umap/tests/integration/test_map_list.py,sha256=l1FImKnJkY7DupYX8waKaUZqhnORR20L8dzaqu-eF8E,1280
|
|
561
555
|
umap/tests/integration/test_map_preview.py,sha256=kP0vkEiUN7EJNCvZgNeUAzrrXfgwpU0S2UnmOBV4P5A,3540
|
|
@@ -575,8 +569,8 @@ umap/tests/integration/test_view_marker.py,sha256=ZLS6-GOWYpjeoYGHiHa7HesXJTLu9w
|
|
|
575
569
|
umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
|
|
576
570
|
umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
|
|
577
571
|
umap/tests/integration/test_websocket_sync.py,sha256=Xjn8z7Gj2PAmPmLkMTsHztFmhzsfyE3vg-wfewpA2I4,15511
|
|
578
|
-
umap_project-2.8.
|
|
579
|
-
umap_project-2.8.
|
|
580
|
-
umap_project-2.8.
|
|
581
|
-
umap_project-2.8.
|
|
582
|
-
umap_project-2.8.
|
|
572
|
+
umap_project-2.8.0a0.dist-info/METADATA,sha256=a0AHRG8dpF_7KYUQNFAGMe84KPD56yidRdzGIilsJCU,2993
|
|
573
|
+
umap_project-2.8.0a0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
|
|
574
|
+
umap_project-2.8.0a0.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
|
|
575
|
+
umap_project-2.8.0a0.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
|
|
576
|
+
umap_project-2.8.0a0.dist-info/RECORD,,
|
umap/settings/local_s3.py
DELETED
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
from umap.settings.local import *
|
|
2
|
-
|
|
3
|
-
DATABASES = {
|
|
4
|
-
"default": {
|
|
5
|
-
"ENGINE": "django.contrib.gis.db.backends.postgis",
|
|
6
|
-
"NAME": "umaps3",
|
|
7
|
-
}
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
STORAGES = {
|
|
11
|
-
"default": {
|
|
12
|
-
"BACKEND": "storages.backends.s3.S3Storage",
|
|
13
|
-
"OPTIONS": {
|
|
14
|
-
"access_key": "OScTD3CClCcO54Ax2DLz",
|
|
15
|
-
"secret_key": "eK9tfPRHoFh0nKLkZpJJoC4RJS1ptGfko3iBBd5k",
|
|
16
|
-
"bucket_name": "umap-default",
|
|
17
|
-
"region_name": "eu",
|
|
18
|
-
"endpoint_url": "http://127.0.0.1:9000",
|
|
19
|
-
},
|
|
20
|
-
},
|
|
21
|
-
"data": {
|
|
22
|
-
"BACKEND": "umap.storage.s3.S3DataStorage",
|
|
23
|
-
"OPTIONS": {
|
|
24
|
-
"access_key": "OScTD3CClCcO54Ax2DLz",
|
|
25
|
-
"secret_key": "eK9tfPRHoFh0nKLkZpJJoC4RJS1ptGfko3iBBd5k",
|
|
26
|
-
"bucket_name": "umap",
|
|
27
|
-
"region_name": "eu",
|
|
28
|
-
"endpoint_url": "http://127.0.0.1:9000",
|
|
29
|
-
},
|
|
30
|
-
},
|
|
31
|
-
"staticfiles": {
|
|
32
|
-
"BACKEND": "storages.backends.s3.S3Storage",
|
|
33
|
-
"OPTIONS": {
|
|
34
|
-
"access_key": "OScTD3CClCcO54Ax2DLz",
|
|
35
|
-
"secret_key": "eK9tfPRHoFh0nKLkZpJJoC4RJS1ptGfko3iBBd5k",
|
|
36
|
-
"bucket_name": "umap-staticfiles",
|
|
37
|
-
"region_name": "eu",
|
|
38
|
-
"endpoint_url": "http://127.0.0.1:9000",
|
|
39
|
-
"default_acl": "public-read",
|
|
40
|
-
# "querystring_auth": False,
|
|
41
|
-
},
|
|
42
|
-
},
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
# STATIC_URL = "http://127.0.0.1:9000/umap-staticfiles/"
|
umap/storage/__init__.py
DELETED
umap/storage/fs.py
DELETED
|
@@ -1,101 +0,0 @@
|
|
|
1
|
-
import operator
|
|
2
|
-
import os
|
|
3
|
-
import time
|
|
4
|
-
from pathlib import Path
|
|
5
|
-
|
|
6
|
-
from django.conf import settings
|
|
7
|
-
from django.core.files.storage import FileSystemStorage
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
class FSDataStorage(FileSystemStorage):
|
|
11
|
-
def get_reference_version(self, instance):
|
|
12
|
-
return self._extract_version_ref(instance.geojson.name)
|
|
13
|
-
|
|
14
|
-
def make_filename(self, instance):
|
|
15
|
-
root = self._base_path(instance)
|
|
16
|
-
name = "%s_%s.geojson" % (instance.pk, int(time.time() * 1000))
|
|
17
|
-
return root / name
|
|
18
|
-
|
|
19
|
-
def list_versions(self, instance):
|
|
20
|
-
root = self._base_path(instance)
|
|
21
|
-
names = self.listdir(root)[1]
|
|
22
|
-
names = [name for name in names if self._is_valid_version(name, instance)]
|
|
23
|
-
versions = [self._version_metadata(name, instance) for name in names]
|
|
24
|
-
versions.sort(reverse=True, key=operator.itemgetter("at"))
|
|
25
|
-
return versions
|
|
26
|
-
|
|
27
|
-
def get_version(self, ref, instance):
|
|
28
|
-
with self.open(self.get_version_path(ref, instance), "r") as f:
|
|
29
|
-
return f.read()
|
|
30
|
-
|
|
31
|
-
def get_version_path(self, ref, instance):
|
|
32
|
-
base_path = Path(settings.MEDIA_ROOT) / self._base_path(instance)
|
|
33
|
-
fullpath = base_path / f"{instance.pk}_{ref}.geojson"
|
|
34
|
-
if instance.old_id and not fullpath.exists():
|
|
35
|
-
fullpath = base_path / f"{instance.old_id}_{ref}.geojson"
|
|
36
|
-
if not fullpath.exists():
|
|
37
|
-
raise ValueError(f"Invalid version reference: {ref}")
|
|
38
|
-
return fullpath
|
|
39
|
-
|
|
40
|
-
def onDatalayerSave(self, instance):
|
|
41
|
-
self._purge_gzip(instance)
|
|
42
|
-
self._purge_old_versions(instance, keep=settings.UMAP_KEEP_VERSIONS)
|
|
43
|
-
|
|
44
|
-
def onDatalayerDelete(self, instance):
|
|
45
|
-
self._purge_gzip(instance)
|
|
46
|
-
self._purge_old_versions(instance, keep=None)
|
|
47
|
-
|
|
48
|
-
def _extract_version_ref(self, path):
|
|
49
|
-
version = path.split(".")[0]
|
|
50
|
-
if "_" in version:
|
|
51
|
-
return version.split("_")[-1]
|
|
52
|
-
return version
|
|
53
|
-
|
|
54
|
-
def _base_path(self, instance):
|
|
55
|
-
path = ["datalayer", str(instance.map.pk)[-1]]
|
|
56
|
-
if len(str(instance.map.pk)) > 1:
|
|
57
|
-
path.append(str(instance.map.pk)[-2])
|
|
58
|
-
path.append(str(instance.map.pk))
|
|
59
|
-
return Path(os.path.join(*path))
|
|
60
|
-
|
|
61
|
-
def _is_valid_version(self, name, instance):
|
|
62
|
-
valid_prefixes = [name.startswith("%s_" % instance.pk)]
|
|
63
|
-
if instance.old_id:
|
|
64
|
-
valid_prefixes.append(name.startswith("%s_" % instance.old_id))
|
|
65
|
-
return any(valid_prefixes) and name.endswith(".geojson")
|
|
66
|
-
|
|
67
|
-
def _version_metadata(self, name, instance):
|
|
68
|
-
ref = self._extract_version_ref(name)
|
|
69
|
-
return {
|
|
70
|
-
"name": name,
|
|
71
|
-
"ref": ref,
|
|
72
|
-
"at": ref,
|
|
73
|
-
"size": self.size(self._base_path(instance) / name),
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
def _purge_old_versions(self, instance, keep=None):
|
|
77
|
-
root = self._base_path(instance)
|
|
78
|
-
versions = self.list_versions(instance)
|
|
79
|
-
if keep is not None:
|
|
80
|
-
versions = versions[keep:]
|
|
81
|
-
for version in versions:
|
|
82
|
-
name = version["name"]
|
|
83
|
-
# Should not be in the list, but ensure to not delete the file
|
|
84
|
-
# currently used in database
|
|
85
|
-
if keep is not None and instance.geojson.name.endswith(name):
|
|
86
|
-
continue
|
|
87
|
-
try:
|
|
88
|
-
self.delete(root / name)
|
|
89
|
-
except FileNotFoundError:
|
|
90
|
-
pass
|
|
91
|
-
|
|
92
|
-
def _purge_gzip(self, instance):
|
|
93
|
-
root = self._base_path(instance)
|
|
94
|
-
names = self.listdir(root)[1]
|
|
95
|
-
prefixes = [f"{instance.pk}_"]
|
|
96
|
-
if instance.old_id:
|
|
97
|
-
prefixes.append(f"{instance.old_id}_")
|
|
98
|
-
prefixes = tuple(prefixes)
|
|
99
|
-
for name in names:
|
|
100
|
-
if name.startswith(prefixes) and name.endswith(".gz"):
|
|
101
|
-
self.delete(root / name)
|
umap/storage/s3.py
DELETED
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
from gzip import GzipFile
|
|
2
|
-
|
|
3
|
-
from django.core.exceptions import ImproperlyConfigured
|
|
4
|
-
|
|
5
|
-
try:
|
|
6
|
-
from botocore.exceptions import ClientError
|
|
7
|
-
from storages.backends.s3 import S3Storage
|
|
8
|
-
except ImportError:
|
|
9
|
-
raise ImproperlyConfigured(
|
|
10
|
-
"You need to install s3 dependencies: pip install umap-project[s3]"
|
|
11
|
-
)
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
class S3DataStorage(S3Storage):
|
|
15
|
-
gzip = True
|
|
16
|
-
|
|
17
|
-
def get_reference_version(self, instance):
|
|
18
|
-
metadata = self.connection.meta.client.head_object(
|
|
19
|
-
Bucket=self.bucket_name, Key=instance.geojson.name
|
|
20
|
-
)
|
|
21
|
-
# Do not fail if bucket does not handle versioning
|
|
22
|
-
return metadata.get("VersionId", metadata["ETag"])
|
|
23
|
-
|
|
24
|
-
def make_filename(self, instance):
|
|
25
|
-
return f"{str(instance.pk)}.geojson"
|
|
26
|
-
|
|
27
|
-
def list_versions(self, instance):
|
|
28
|
-
response = self.connection.meta.client.list_object_versions(
|
|
29
|
-
Bucket=self.bucket_name, Prefix=instance.geojson.name
|
|
30
|
-
)
|
|
31
|
-
return [
|
|
32
|
-
{
|
|
33
|
-
"ref": version["VersionId"],
|
|
34
|
-
"at": version["LastModified"].timestamp() * 1000,
|
|
35
|
-
"size": version["Size"],
|
|
36
|
-
}
|
|
37
|
-
for version in response["Versions"]
|
|
38
|
-
]
|
|
39
|
-
|
|
40
|
-
def get_version(self, ref, instance):
|
|
41
|
-
try:
|
|
42
|
-
data = self.connection.meta.client.get_object(
|
|
43
|
-
Bucket=self.bucket_name,
|
|
44
|
-
Key=instance.geojson.name,
|
|
45
|
-
VersionId=ref,
|
|
46
|
-
)
|
|
47
|
-
except ClientError:
|
|
48
|
-
raise ValueError(f"Invalid version reference: {ref}")
|
|
49
|
-
return GzipFile(mode="r", fileobj=data["Body"]).read()
|
|
50
|
-
|
|
51
|
-
def get_version_path(self, ref, instance):
|
|
52
|
-
return self.url(instance.geojson.name, parameters={"VersionId": ref})
|
|
53
|
-
|
|
54
|
-
def onDatalayerSave(self, instance):
|
|
55
|
-
pass
|
|
56
|
-
|
|
57
|
-
def onDatalayerDelete(self, instance):
|
|
58
|
-
return self.connection.meta.client.delete_object(
|
|
59
|
-
Bucket=self.bucket_name,
|
|
60
|
-
Key=instance.geojson.name,
|
|
61
|
-
)
|
umap/storage/staticfiles.py
DELETED
|
@@ -1,64 +0,0 @@
|
|
|
1
|
-
from pathlib import Path
|
|
2
|
-
|
|
3
|
-
from django.conf import settings
|
|
4
|
-
from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
|
|
5
|
-
from rcssmin import cssmin
|
|
6
|
-
from rjsmin import jsmin
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage):
|
|
10
|
-
support_js_module_import_aggregation = True
|
|
11
|
-
max_post_process_passes = 15
|
|
12
|
-
|
|
13
|
-
# We remove `;` at the end of all regexps to match our biome config.
|
|
14
|
-
_js_module_import_aggregation_patterns = (
|
|
15
|
-
"*.js",
|
|
16
|
-
(
|
|
17
|
-
(
|
|
18
|
-
(
|
|
19
|
-
r"""(?P<matched>import(?s:(?P<import>[\s\{].*?))"""
|
|
20
|
-
r"""\s*from\s*['"](?P<url>[\.\/].*?)["']\s*)"""
|
|
21
|
-
),
|
|
22
|
-
'import%(import)s from "%(url)s"\n',
|
|
23
|
-
),
|
|
24
|
-
(
|
|
25
|
-
(
|
|
26
|
-
r"""(?P<matched>export(?s:(?P<exports>[\s\{].*?))"""
|
|
27
|
-
r"""\s*from\s*["'](?P<url>[\.\/].*?)["']\s*)"""
|
|
28
|
-
),
|
|
29
|
-
'export%(exports)s from "%(url)s"\n',
|
|
30
|
-
),
|
|
31
|
-
(
|
|
32
|
-
r"""(?P<matched>import\s*['"](?P<url>[\.\/].*?)["']\s*)""",
|
|
33
|
-
'import"%(url)s"\n',
|
|
34
|
-
),
|
|
35
|
-
(
|
|
36
|
-
r"""(?P<matched>import\(["'](?P<url>.*?)["']\)\.then)""",
|
|
37
|
-
"""import("%(url)s").then""",
|
|
38
|
-
),
|
|
39
|
-
(
|
|
40
|
-
r"""(?P<matched>await import\(["'](?P<url>.*?)["']\))""",
|
|
41
|
-
"""await import("%(url)s")""",
|
|
42
|
-
),
|
|
43
|
-
),
|
|
44
|
-
)
|
|
45
|
-
|
|
46
|
-
def post_process(self, paths, **options):
|
|
47
|
-
collected = super().post_process(paths, **options)
|
|
48
|
-
for original_path, processed_path, processed in collected:
|
|
49
|
-
if isinstance(processed, Exception):
|
|
50
|
-
print("Error with file", original_path)
|
|
51
|
-
raise processed
|
|
52
|
-
if processed_path.endswith(".js"):
|
|
53
|
-
path = Path(settings.STATIC_ROOT) / processed_path
|
|
54
|
-
initial = path.read_text()
|
|
55
|
-
if "sourceMappingURL" not in initial: # Already minified.
|
|
56
|
-
minified = jsmin(initial)
|
|
57
|
-
path.write_text(minified)
|
|
58
|
-
if processed_path.endswith(".css"):
|
|
59
|
-
path = Path(settings.STATIC_ROOT) / processed_path
|
|
60
|
-
initial = path.read_text()
|
|
61
|
-
if "sourceMappingURL" not in initial: # Already minified.
|
|
62
|
-
minified = cssmin(initial)
|
|
63
|
-
path.write_text(minified)
|
|
64
|
-
yield original_path, processed_path, True
|