diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc index 663e20c..4596378 100644 Binary files a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc and b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc differ diff --git a/plovidba_aplikacija/management/commands/__pycache__/import_objekti_sigurnosti.cpython-38.pyc b/plovidba_aplikacija/management/commands/__pycache__/import_objekti_sigurnosti.cpython-38.pyc index ea36cbe..f658c84 100644 Binary files a/plovidba_aplikacija/management/commands/__pycache__/import_objekti_sigurnosti.cpython-38.pyc and b/plovidba_aplikacija/management/commands/__pycache__/import_objekti_sigurnosti.cpython-38.pyc differ 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 0000000..24704c3 Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more.cpython-38.pyc differ diff --git a/plovidba_aplikacija/models.py b/plovidba_aplikacija/models.py index e3aac0d..be55f22 100644 --- a/plovidba_aplikacija/models.py +++ b/plovidba_aplikacija/models.py @@ -1,9 +1,16 @@ from django.db import models from django.contrib.gis.db import models -# Create your models here. - class ObjektSigurnosti(models.Model): naziv = models.CharField(max_length=255) lokacija = models.PointField(null=True, srid=3765) + ps_br = models.CharField(max_length=255, null=True, blank=True) + e_br = models.CharField(max_length=255, null=True, blank=True) + tip_objekta = models.IntegerField(null=True, blank=True) + lucka_kapetanija = models.CharField(max_length=255, null=True, blank=True) + fotografija = models.CharField(max_length=255, null=True, blank=True) + id_ais = models.CharField(max_length=255, null=True, blank=True) + simbol_oznaka = models.CharField(max_length=255, null=True, blank=True) + def __str__(self): + return self.naziv \ No newline at end of file