From 6614ae2e44c39888ffdebcdd81f207a8c239d411 Mon Sep 17 00:00:00 2001 From: emaric Date: Wed, 10 Jan 2024 13:53:34 +0100 Subject: [PATCH] dodani svi --- .../__pycache__/models.cpython-38.pyc | Bin 541 -> 920 bytes .../import_objekti_sigurnosti.cpython-38.pyc | Bin 1869 -> 2130 bytes .../commands/import_objekti_sigurnosti.py | 20 +++++++- ...r_objektsigurnosti_fotografija_and_more.py | 48 ++++++++++++++++++ ...rnosti_fotografija_and_more.cpython-38.pyc | Bin 0 -> 1039 bytes plovidba_aplikacija/models.py | 11 +++- 6 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 plovidba_aplikacija/migrations/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.py create mode 100644 plovidba_aplikacija/migrations/__pycache__/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.cpython-38.pyc diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc index 663e20c961e4075ddad6f2513384b77d30b7f408..45963784c2fd71c28800b7257a5ef64eca816aa1 100644 GIT binary patch delta 545 zcmZ9I&q~8U5XQ4f+NSx_M)2SZc!&ozHChF3aE1k`LcZ6 zpHpLG#wa#mR~JTTm2@4ny{^_4dgzp@Zb^G3-6-j1Y{m5lE%al%rv*;ocb6ZhH-RD4 zn?w~*RHBq*NuaNlu;8eV0RKznDlQr z4P%)LjGM}&12i<->qaA*SzJo{&Bp zk+3q6I1-^rfrZ=7ayq19)8yoAg86zh3H@~1PY6!PgytkuPG`V#J``l2M3u#uFd2H1 zjU%37KFdf#ga;Rk6Gw3iS4jh4Ldac!gTdrV}N`B delta 144 zcmbQiK9_|rl$V!_0SIog%}xEzFp;l-iv`GY0ODe`i5;qJDQv+En(UJ`87-OpG&v@F zF`1}EvF0UKWtQFI3dqmQD{;$A%}I&k$jQ%6OwPoa$}8iGb^tuYqZ42Q;fK|ss{QPt;r2Yo<0=c@a_Sx zKxhRJ=8n>~(lw@<8fh^PH{F=G)EZ%bEpDuq5{i||EJp2iW|gYKjTKQwVA)g?6~H6?kHd>~Pj zzR;F*@)C60;-j{>@V_~+t$TP&?CQ&#_hAZQmuOfcF0K*_H?V~*(5~E1FLE9e;s7>E z1}0D^r`Pu?6`IkzepP`te*$BXSPe@Gr#V9{ z3sAA(0^u6IED<0UUC0D6qJ|YL%LcHFLgvm27Z!WWb0vlEjuvl1uIW4X%B4-B#*Q21#IOs-?C61v5lpOkfrJ-H|qs5NCJ zLy_iWUA75&Ww7j4Vt7j9g4yi~@{2j66U#kYH8)UL3DxozwgI$(Q3?wKxxto2W0EWB{hZ+D(^>UQ} diff --git a/plovidba_aplikacija/management/commands/import_objekti_sigurnosti.py b/plovidba_aplikacija/management/commands/import_objekti_sigurnosti.py index 9805cea..dcf9adb 100644 --- a/plovidba_aplikacija/management/commands/import_objekti_sigurnosti.py +++ b/plovidba_aplikacija/management/commands/import_objekti_sigurnosti.py @@ -30,9 +30,18 @@ class Command(BaseCommand): latitude = geometry.get('coordinates', [])[1] longitude = geometry.get('coordinates', [])[0] naziv_objekta = properties.get('naziv_objekta', '') + ps_br = properties.get('ps_br', None) + e_br = properties.get('e_br', None) + tip_objekta = properties.get('tip_objekta', None) + lucka_kapetanija = properties.get('lucka_kapetanija', None) + fotografija = properties.get('fotografija', '') + id_ais = properties.get('id_ais', None) + simbol_oznaka = properties.get('simbol_oznaka', '') if not (isinstance(latitude, (float, int)) and isinstance(longitude, (float, int))): - print("Skipping invalid coordinates.") + continue + + if not (naziv_objekta and latitude and longitude): continue print(f"Latitude: {latitude}, Longitude: {longitude}, Naziv Objekta: {naziv_objekta}") @@ -40,7 +49,14 @@ class Command(BaseCommand): obj, created = ObjektSigurnosti.objects.get_or_create( naziv=naziv_objekta, - lokacija=Point(float(longitude), float(latitude)) + lokacija=Point(float(longitude), float(latitude)), + ps_br = ps_br, + e_br = e_br, + tip_objekta = tip_objekta, + lucka_kapetanija = lucka_kapetanija, + fotografija = fotografija, + id_ais = id_ais, + simbol_oznaka = simbol_oznaka, ) if created: created_entries +=1 diff --git a/plovidba_aplikacija/migrations/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.py b/plovidba_aplikacija/migrations/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.py new file mode 100644 index 0000000..2e1bee0 --- /dev/null +++ b/plovidba_aplikacija/migrations/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.py @@ -0,0 +1,48 @@ +# Generated by Django 4.2.9 on 2024-01-10 12:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plovidba_aplikacija', '0007_remove_objektsigurnosti_lat_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='objektsigurnosti', + name='e_br', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='fotografija', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='id_ais', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='lucka_kapetanija', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='ps_br', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='simbol_oznaka', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='tip_objekta', + field=models.IntegerField(blank=True, null=True), + ), + ] diff --git a/plovidba_aplikacija/migrations/__pycache__/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..24704c36dee1b7b401b4d4dcc9c8c14d0cef8634 GIT binary patch literal 1039 zcmbVLPiqu09L@aO?oM~>f_J?Mb1C(th)AWP2wITZ%PSh}u z*u`#tVgZr|oa7-7${>#*o+W+*=*>2G%oFUrvxsk;Et&pWX0Vn?*D{-Hnc-SygiIfG z#eC~5^vcSOe8BIZ31c^SyZn2!;%+1LiQp4PStCWoreeliwzISIh#IK%2~a(mLDgDO z&W+Nx6;!g8GR0}F4Y={Yw2OgG%=`08v@MHVGLcMG=s5dGC8)AJcCngEiB#G-PZg^H z=X_0$1W4{Sk94aspd+uPCpcxoy0M&3D@H5UK+BY8lE&grZe&G0(UR&QwxU^R zW?5+bDKbMW`&sJxwA+nRmr|6^=Mr!{r1Zm_Nw2^o4h<*{YAV2*5WjT&=bXRv%1q?p zVDFfj4!hxN)j|milZVw_U(~0d zPOc$sjP|atCRXVbtHWDhPLFQ~