diff --git a/plovidba_aplikacija/__pycache__/admin.cpython-38.pyc b/plovidba_aplikacija/__pycache__/admin.cpython-38.pyc
index d8b9c76..8e6afab 100644
Binary files a/plovidba_aplikacija/__pycache__/admin.cpython-38.pyc and b/plovidba_aplikacija/__pycache__/admin.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc
index 884a01b..5734cd9 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/0003_objektsigurnosti_nazi1v.py b/plovidba_aplikacija/migrations/0003_objektsigurnosti_nazi1v.py
new file mode 100644
index 0000000..3225ecf
--- /dev/null
+++ b/plovidba_aplikacija/migrations/0003_objektsigurnosti_nazi1v.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.9 on 2024-01-09 08:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plovidba_aplikacija', '0002_remove_objektsigurnosti_lokacija_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='objektsigurnosti',
+            name='nazi1v',
+            field=models.CharField(default='test', max_length=255),
+            preserve_default=False,
+        ),
+    ]
diff --git a/plovidba_aplikacija/migrations/0004_remove_objektsigurnosti_nazi1v.py b/plovidba_aplikacija/migrations/0004_remove_objektsigurnosti_nazi1v.py
new file mode 100644
index 0000000..fec40fa
--- /dev/null
+++ b/plovidba_aplikacija/migrations/0004_remove_objektsigurnosti_nazi1v.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.9 on 2024-01-09 08:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plovidba_aplikacija', '0003_objektsigurnosti_nazi1v'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='objektsigurnosti',
+            name='nazi1v',
+        ),
+    ]
diff --git a/plovidba_aplikacija/migrations/0005_objektsigurnosti_lokacija.py b/plovidba_aplikacija/migrations/0005_objektsigurnosti_lokacija.py
new file mode 100644
index 0000000..fb40b6f
--- /dev/null
+++ b/plovidba_aplikacija/migrations/0005_objektsigurnosti_lokacija.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.9 on 2024-01-09 08:16
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plovidba_aplikacija', '0004_remove_objektsigurnosti_nazi1v'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='objektsigurnosti',
+            name='lokacija',
+            field=django.contrib.gis.db.models.fields.PointField(null=True, srid=4326),
+        ),
+    ]
diff --git a/plovidba_aplikacija/migrations/0006_alter_objektsigurnosti_lokacija.py b/plovidba_aplikacija/migrations/0006_alter_objektsigurnosti_lokacija.py
new file mode 100644
index 0000000..df5d54a
--- /dev/null
+++ b/plovidba_aplikacija/migrations/0006_alter_objektsigurnosti_lokacija.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.9 on 2024-01-09 08:16
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plovidba_aplikacija', '0005_objektsigurnosti_lokacija'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='objektsigurnosti',
+            name='lokacija',
+            field=django.contrib.gis.db.models.fields.PointField(null=True, srid=3765),
+        ),
+    ]
diff --git a/plovidba_aplikacija/migrations/0007_remove_objektsigurnosti_lat_and_more.py b/plovidba_aplikacija/migrations/0007_remove_objektsigurnosti_lat_and_more.py
new file mode 100644
index 0000000..badc7e9
--- /dev/null
+++ b/plovidba_aplikacija/migrations/0007_remove_objektsigurnosti_lat_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.9 on 2024-01-09 08:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plovidba_aplikacija', '0006_alter_objektsigurnosti_lokacija'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='objektsigurnosti',
+            name='lat',
+        ),
+        migrations.RemoveField(
+            model_name='objektsigurnosti',
+            name='lon',
+        ),
+    ]
diff --git a/plovidba_aplikacija/migrations/__pycache__/0001_initial.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0001_initial.cpython-38.pyc
index 57b4bf4..354570f 100644
Binary files a/plovidba_aplikacija/migrations/__pycache__/0001_initial.cpython-38.pyc and b/plovidba_aplikacija/migrations/__pycache__/0001_initial.cpython-38.pyc differ
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
index 27c3fb1..5e4e8a2 100644
Binary files a/plovidba_aplikacija/migrations/__pycache__/0002_remove_objektsigurnosti_lokacija_and_more.cpython-38.pyc and b/plovidba_aplikacija/migrations/__pycache__/0002_remove_objektsigurnosti_lokacija_and_more.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/migrations/__pycache__/0003_objektsigurnosti_nazi1v.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0003_objektsigurnosti_nazi1v.cpython-38.pyc
new file mode 100644
index 0000000..9cc91cd
Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0003_objektsigurnosti_nazi1v.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/migrations/__pycache__/0004_remove_objektsigurnosti_nazi1v.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0004_remove_objektsigurnosti_nazi1v.cpython-38.pyc
new file mode 100644
index 0000000..a4fdce4
Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0004_remove_objektsigurnosti_nazi1v.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/migrations/__pycache__/0005_objektsigurnosti_lokacija.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0005_objektsigurnosti_lokacija.cpython-38.pyc
new file mode 100644
index 0000000..1c83144
Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0005_objektsigurnosti_lokacija.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/migrations/__pycache__/0006_alter_objektsigurnosti_lokacija.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0006_alter_objektsigurnosti_lokacija.cpython-38.pyc
new file mode 100644
index 0000000..d38b724
Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0006_alter_objektsigurnosti_lokacija.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/migrations/__pycache__/0007_remove_objektsigurnosti_lat_and_more.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0007_remove_objektsigurnosti_lat_and_more.cpython-38.pyc
new file mode 100644
index 0000000..15fac08
Binary files /dev/null and b/plovidba_aplikacija/migrations/__pycache__/0007_remove_objektsigurnosti_lat_and_more.cpython-38.pyc differ
diff --git a/plovidba_aplikacija/models.py b/plovidba_aplikacija/models.py
index 4fcfd56..e3aac0d 100644
--- a/plovidba_aplikacija/models.py
+++ b/plovidba_aplikacija/models.py
@@ -1,9 +1,9 @@
 from django.db import models
+from django.contrib.gis.db import models
 
 # Create your models here.
 
 class ObjektSigurnosti(models.Model):
-    lat = models.FloatField(default=0.0)
-    lon = models.FloatField(default=0.0)
     naziv = models.CharField(max_length=255)
-    
+    lokacija = models.PointField(null=True, srid=3765)
+
diff --git a/plovidba_projekt/__pycache__/settings.cpython-38.pyc b/plovidba_projekt/__pycache__/settings.cpython-38.pyc
index 2fc8ed7..6dfe645 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 6b10c80..a2e9011 100644
--- a/plovidba_projekt/settings.py
+++ b/plovidba_projekt/settings.py
@@ -22,14 +22,6 @@ from osgeo import gdal
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-# use this if setting up on Windows 10 with GDAL installed from OSGeo4W using defaults
-if os.name == 'nt':
-    VIRTUAL_ENV_BASE = os.environ['VIRTUAL_ENV']
-    os.environ['PATH'] = os.path.join(VIRTUAL_ENV_BASE, r'.\Lib\site-packages\osgeo') + ';' + os.environ['PATH']
-    os.environ['PROJ_LIB'] = os.path.join(VIRTUAL_ENV_BASE, r'.\Lib\site-packages\osgeo\data\proj') + ';' + os.environ['PATH']
-
-GDAL_LIBRARY_PATH = r'C:\Users\Student1\Desktop\plovidba\myenv\djangoenv\Lib\site-packages\osgeo\gdal304.dll'
-
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
@@ -52,9 +44,10 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.gis',
     'rest_framework',
     'plovidba_aplikacija',
-    'django.contrib.gis',
+    
 ]
 
 MIDDLEWARE = [
@@ -93,7 +86,7 @@ WSGI_APPLICATION = 'plovidba_projekt.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql',
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
         'NAME': 'plovidba_db',
         'USER': 'postgres',
         'PASSWORD': 'postgres',