From b89fde9c925fc8b9efa896a61bc9b71eb7c32b83 Mon Sep 17 00:00:00 2001
From: emaric <elena.maric@listlabs.net>
Date: Mon, 8 Jan 2024 15:41:02 +0100
Subject: [PATCH] prije dodavanja aplikacije

---
 .../__pycache__/models.cpython-38.pyc         | Bin 515 -> 553 bytes
 ...move_objektsigurnosti_lokacija_and_more.py |  23 ++++++++++++++++++
 ...igurnosti_lokacija_and_more.cpython-38.pyc | Bin 0 -> 698 bytes
 plovidba_aplikacija/models.py                 |   3 ++-
 .../__pycache__/settings.cpython-38.pyc       | Bin 2947 -> 2980 bytes
 plovidba_projekt/settings.py                  |   6 +++--
 6 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 plovidba_aplikacija/migrations/0002_remove_objektsigurnosti_lokacija_and_more.py
 create mode 100644 plovidba_aplikacija/migrations/__pycache__/0002_remove_objektsigurnosti_lokacija_and_more.cpython-38.pyc

diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc
index fc0ab47042be128d7bc1193b6910568edfbc8861..da2f98233d5973bc63ee3d494149472289e90d1a 100644
GIT binary patch
delta 232
zcmZo>S;@i|%FD~e00b-?b5f-lC-POs7yx;x3{i|J3{gy}%vmfcj44dLj8UveY&Ia9
zJ%u@i1t`vu!Wzt=$#zS?KPf9UyCgU>y|gGVzqlkb9b_yBXfobnPf1NnEX^sIxL=f!
zbK+HPeYc$a#1gm6)SQ$k=A6V5Ad#PUi_<wHu?Ql_nwMCWS+<g)hzDpu5zl0O#xzbg
tAd`cUhmmLU97bC$hy+*`MDPNMTO2mI`6;D2sdkJ&UNH-h;9=!q0suZpHZK4G

delta 189
zcmZ3<(#*ma%FD~e00h%t&Q5*JFp;m)PXWkFWr$)-VTfW%WnRFtkRggSl{t$og)xPx
zmobVxg*li(ljW9xe^ORzc1dt%dTCK!esM|W%l|-)nvA!&auX}!b5irtOEUa4IVS$p
z)(^<f%qwxrOwCD&;>gL*PE5|sO1#DCoRL@r5oFCvtja7~$xy@%G@*!laxh~WI}4D>
X!N@WB5TmUCL>MdwB6ueAGf4pe9CI`L

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 0000000000000000000000000000000000000000..27c3fb11df09f272b55b0440da02640740fe771b
GIT binary patch
literal 698
zcmZ8f&1&2*5SA=^*J~08w7v8J3ciF*Z~dX9KcuJT5^^yHq1~And1cGBybC$Er$XMK
zFVI)gwWq#9ptK`zx4Z3_8Rkzj`ab#k_&8%E&t_loMa0<m5FAQO!8xgWLIxOc!x~=j
zCMqJ%-ZO|md}bh!*W!~X1jJV?PkvA@%OjsPy6V-SZR`A`v4F-cL+Mba6r7W~H)N0%
z99R(nuXrIau9L6;C-oF!NbWdH?snPfzu77(Qb=j}%+EgTw$c?IbjEHpER<B8(JQso
zwem;v`TR`kRu5X4;>0d$Tn$cF>%O&a&|VldRCJwDa_*;qH)?H$To9xHL$<0xACES<
z(P)6q*!GgPr*bSx=`$&*d2NvVBPl<wl?ewz1lVB<*e*4?o@i%2eGPCC2K6F@*@dxc
z7!y9T9sXhQ8|xoZc{KN5-aap{9rmug8rC#yI4j?wTMf1=cc9DW7Te9=P<FiyQ1^*F
zDdqmHN}}hf?6I*Ml>d_>joq>+RSN{L$J6e%55LKT)IBDXis)CI#5|%e`+4BqkA0VU
k>}OD`wz8+N7~zkg$KoE})_X+reEM=r<g37q3w)i3-@T{7DgXcg

literal 0
HcmV?d00001

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 70ffa9728263fbbdad1f855b1186c481996ee639..2fc8ed749fb4bc9fa4c0a916b444378400b5b0a4 100644
GIT binary patch
delta 500
zcmZuuJx|+U5Po0Vi9cdHApuN)1VUR%2z8qB(GCplP^n`@#d2H1W4&?+aj_YZKtlZi
z#cPHlb?EN78&dy6*Zv45B;Ev&7<#9>d+zSJ(@A&X{q$P<j$<(?kueIw5@Y|y$x|_9
z@?Ki9_r2wxX#?ZPB$Km1?^{0#PrMzdSA49LmsJP3LnZztk&AqlQE|d71x4sr3Jh;N
z@4~FIN3?stam=v(%P8zJ*k?2ahstoNA{b4hh!UnyMg`ND!7Mys(hTNM#XJ_Uh#Klb
zr&%nKhh@RwqJb4W!*je4TF9|F(gdeDyre4D(8M}gQaA7l{wN=EnnxS2C9jRn#JAo|
z!e+>YMhn=YMQl?|o>P~$gdJMOTWUc4!kX{0Q~rq?P5xIC=nk@L<u|XC(eDmL<R3)C
zlQ``8B22P#?T=EgJv7ksd)<S>V2H&38YL$p4wB<RI@I@hF}v13a=wyU=7&NqN<<LF
ps(eiL*=+NCN20isezW@SrG%Pot0mRowwm5rjT~2QG$(BodUs4=cGmy^

delta 466
zcmZuuJx{_=6n(F)w1u{!s1?BvL`6j_eohW*Vq%P&ak(3CnwO#h1MDO^xN17;ppk#j
z+0`H5?&M!^aP&c9!r(o*C+D7fhMU~3d+Qc2Y&*_m<-Q;N(<EbGy<xBnIULAtojnx2
zj(TN~;p;W?IX=J%Uwz>{P)xcOv`eMgmCD9Ynvv5_4*L#bFA8**^*2VE{i*$)V?Os1
z=D&&fK0|_%usSpXn??nr6dVjAi4lw<g)xi^gT^oc7n4Y13K?XDPUD!S3Csuv8?%^0
z4)e$hE#O#q(gY_Li!_NP6tIjHiB%M__7n>^rLhiA=GL*%=Te^+Hv=v-n!*-kuuWNc
z%(Uzo?9eQBX%6Z+TiJ_l_z90bls6u|YVS&63AJ)vG`wn~-fjjJPXsLw6|YjRUix*k
zyz54*Exqtgzu->vsULHm3-jjTkS0*RiW=qykCo&Lnx(KCuQ~TpYL=xYRf8K!m`&u=
KAI%Dn5|v*a0d7A4

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',