diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc index fc0ab47..da2f982 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/migrations/0002_remove_objektsigurnosti_lokacija_and_more.py b/plovidba_aplikacija/migrations/0002_remove_objektsigurnosti_lokacija_and_more.py new file mode 100644 index 0000000..8adcff8 --- /dev/null +++ b/plovidba_aplikacija/migrations/0002_remove_objektsigurnosti_lokacija_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.9 on 2024-01-08 14:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plovidba_aplikacija', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='objektsigurnosti', + name='lat', + field=models.FloatField(default=0.0), + ), + migrations.AddField( + model_name='objektsigurnosti', + name='lon', + field=models.FloatField(default=0.0), + ), + ] diff --git a/plovidba_aplikacija/migrations/__pycache__/0002_remove_objektsigurnosti_lokacija_and_more.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0002_remove_objektsigurnosti_lokacija_and_more.cpython-38.pyc new file mode 100644 index 0000000..27c3fb1 Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0002_remove_objektsigurnosti_lokacija_and_more.cpython-38.pyc differ diff --git a/plovidba_aplikacija/models.py b/plovidba_aplikacija/models.py index a7d84e3..c188d10 100644 --- a/plovidba_aplikacija/models.py +++ b/plovidba_aplikacija/models.py @@ -6,6 +6,7 @@ from django.db import models from django.contrib.gis.db import models class ObjektSigurnosti(models.Model): - lokacija = models.PointField() + lat = models.FloatField(default=0.0) + lon = models.FloatField(default=0.0) naziv = models.CharField(max_length=255) diff --git a/plovidba_projekt/__pycache__/settings.cpython-38.pyc b/plovidba_projekt/__pycache__/settings.cpython-38.pyc index 70ffa97..2fc8ed7 100644 Binary files a/plovidba_projekt/__pycache__/settings.cpython-38.pyc and b/plovidba_projekt/__pycache__/settings.cpython-38.pyc differ diff --git a/plovidba_projekt/settings.py b/plovidba_projekt/settings.py index d43d424..6b10c80 100644 --- a/plovidba_projekt/settings.py +++ b/plovidba_projekt/settings.py @@ -17,7 +17,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent # dodano import os -import GDAL +from osgeo import gdal + BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -53,6 +54,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'rest_framework', 'plovidba_aplikacija', + 'django.contrib.gis', ] MIDDLEWARE = [ @@ -91,7 +93,7 @@ WSGI_APPLICATION = 'plovidba_projekt.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'plovidba_db', 'USER': 'postgres', 'PASSWORD': 'postgres',