From 5d8894c5c56fc1bca581033efc114b929cfc2001 Mon Sep 17 00:00:00 2001
From: Janis M <janis.meister87@gmail.com>
Date: Tue, 22 Mar 2022 12:41:36 +0100
Subject: [PATCH] get shops

---
 .vscode/settings.json                       |   4 +++
 __pycache__/objects.cpython-310.pyc         | Bin 949 -> 1532 bytes
 __pycache__/osm.cpython-310.pyc             | Bin 1798 -> 2696 bytes
 __pycache__/places.cpython-310.pyc          | Bin 0 -> 1291 bytes
 __pycache__/publicTransport.cpython-310.pyc | Bin 1681 -> 1673 bytes
 main.py                                     |  18 ++++++----
 objects.py                                  |  19 +++++++++-
 osm.py                                      |  37 +++++++++++++++++++-
 places.py                                   |  35 ++++++++++++++++++
 9 files changed, 105 insertions(+), 8 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 __pycache__/places.cpython-310.pyc
 create mode 100644 places.py

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..cc67606
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true
+}
\ No newline at end of file
diff --git a/__pycache__/objects.cpython-310.pyc b/__pycache__/objects.cpython-310.pyc
index 4b2586f83c1a926be025c1f26b2a9ccf79ba7fba..a716978aff58c980c74cc999fa22afc5fe642d30 100644
GIT binary patch
literal 1532
zcma)6%We}f6!nbfl_5z>c`kUrq)4b6Hh?Nr)Jh11!h#~CD3UeJm@+h(6nj#Xs=M|t
z_=5hDw|qi&tT@-{bf&yoM?Sh|e0}YE?sdkkR?INgzCYW1;xYDvNPTdSRZP7Cc*Rnd
zI)|7CZjYFoaxf0&fO)A8=7YIlK^lUEU_6c9vrc1x2&aY%wu(8s43Mnnq^#$rPU;>q
z?BUqs8LvA|<)8tFa*$0s*D&=4pkVvXfwRwqQ@H!CwKyzpEf1DwEgzO|tpGa$YlW~v
zYeiU%tkp=_dv@e>JF($eUKlq^4cCP-d^pYlNnyfWsdNU`D6)~%MKankjlt(6-;!Du
zhEK4?n`o&z4dZD!{A9Su(w-*}fe;}gQO1Zx6(kl_6i-kXUr?MQrmi5<pHJ7G_dkH^
z{+lGvbpKs0*HyMF`|DC~7vr7&+wmY7zRZ*1bWf`Oc=L-K6nc4Qit|L4XN3?Xon8dQ
zPW{(*_F5$Ma_QGS@@P|@jHD1I7Gg9`CquHELVTSh!}*H3hEVo$HMmOO=pYAkhPGl6
zYdZGJKbt_2FA5&gEjE&^fe&5|vdfy!9)r|s&W>yD7W|~<ysSCZQc(|g0!8;w6v+fR
z&Ul@wfC%4~Q{(R@!-?$ps!dJ{fL<u(Ud9vT5eVz@dzO?w?U_Y@xuB48@i>V}O?4gX
zwarvcWp%m<t3~Vv0kJbR;vbXgAcSW*$S(EKs~|Of{`MwVsSo_hH{q6VqS7p?G_zVM
zdV7lgFw_NtCIQ{O6IQ}0YA$t=V2R)o0ln~A_BL^nj%3gjrs_q=*F=8jk?tWj+Q?Qq
zVrNPhAoTybOWi`0KRd?%mQ0TuM%^KgyMR;e5{S9WJzBj_U`t%pnbN&Y-yZ<>7UuUj
vPnM71Z*OI@B-ZVC_A%LRQIxl$&$Sazjy2KB{NcW!_ob;z+pOJehfDD<mvkcy

delta 417
zcmYk1!Aiq07{}AB?YeHQA`TG+2VPcu0U08~yeOi=7(yt7+6GtFHCvJn2D|zIrBC4l
zc<|=IyZ1hdcrdAqHIN_tzx+PFFTd^grb`{i2J#F)&z}b{caODRes*F;`UrSNv4Ds9
z>&F3ViFii12xfEC3MWDOLO2nq7;C2(S$Ihpk7<f*ywz;H^>m!Y5i)Sb33~&~k>h@@
zh68^rGxu+UH0J&_;Zs59{v8d2WF!L7dt8YLO^a`hcXwn*)mDRBJVD>#efhN3)&K*c
z6<@F)8p_orN;9PqxrvymLSsr+rLhc>jCclXE2$%an)u&BI+g}9ai!GfC{-=s%F8VY
xvv_D6g}bV*zEXoySXZK|?{Ct*2N~RinqFC|r?f6+G|Ccksma9E_Ac1#`~g7{Vm1H(

diff --git a/__pycache__/osm.cpython-310.pyc b/__pycache__/osm.cpython-310.pyc
index 14d1211f4b71219a9b766c117070b8db08e1eeaf..630f0babba3fe851e5921b0f02455b7d2ecba655 100644
GIT binary patch
literal 2696
zcmd6pO>Y}T7{_O3U%g&CeOFTogp`*WP;%h{N~1!85U9AS+ETFuSzFH%wz1dF>?T#L
zH9~Tad;$)rJ#ys6flt6k*ee357sS~o{?B;b*onoNUCn==nP=viotfXvZm(AJ7_L8m
zdH><>u>PRT>}4Qx6DfTgBAMhJ*5v{3ia>OY!04KR$=N4N3TZrH(in-rlIC63u%4qn
zYnX-E?8&HbNbiNah4COfDr^WcZK^VR31n^}rSC!_7I4V|A-NP!SYSv)ns}Phk~W@}
zbfk-?Ei35GD~#KBKW|fj=|wiBEu?e}lChkRc+OgUmqCSAL#wIP%Gp!<8RHlyLh@$A
zDU38zh1W~FTfHQUlB{qO4CGdvW<`}Oj6!Fe$KjDSJQ&l$rGBW===O`o4N;hB)cGc;
zwvHqI%+wNIZv5WX2RrxENToZUg-M+5+)kox6(2@B+fllg_4+%vdhM|DVG?$Z29er9
zfVKWn;kH_F5@)TJNu%^39=FTe=K~*;vNo;K=5S9h3x<QFX9q*Zj67mbx#Z9I5c4y{
z><o>ZZ?muWho%&{dC1h7H1zZOz{O0VY!|gTd%*U6ju4z>SfUY1zC=kbo|?Hy{(WCs
zy4}YEN4FD`R*8GE74^ICXI3soT-tl4x-%EW(NVt2jhV=<E>k+Pog1ejS0?X6qtTI#
zGV*XP3az)-EVwteHfUJ~VtsRPg_vDw_YOL8CFx}=52KYh!3t%O95@^6RBuz!oQ};6
ztop#-SjS^?u>2rATHLJRC>Qk$EA4mUtnk_@3bTm1DXhMVftMZj`%xkbqZ1`XW#UJ;
zhNbGdVJA+aG^kMDx3uY^OKlY<`7}!tIfDkO1|cfaO)|JCOzsMoyIk-yz{KZ1a)Q@k
z6FA7jM`^aq<KlbsufchO=>*bqJB~V|@oA<$!pulM6q=zQhXxojz)*r+Xn-@Ulr)!#
zI184&%tokN`kVzmv-G(Od{*hJEb!T-&s*SgN?&z>&&@;*!gDLPb0>F4_OOB-Lgb+r
zFl|a-kLRZ{Mr}b1uk_Uy_^O$e*@)=iL=w4|S4Za1r#yP_%N~fzrDnm@1x)JLjOC5h
z=bAUZI^nKzi1Q-uB{x>b)hzBtX%=?-lxcq(Cc9A@Wyn|u)NpJc0A0#%WZ~}0*w}+@
z9Nt)MxQfmJb&-Tl5mhC*OhSi*S|%Ze8Z`}}dI@%5fxAzox=J>kd0$N4B=BM1o4$(9
zZB5@Lu;IHO%YY6`I_e7kxG?sjqry52I|or99%m={y@L4bNa^d43A<PM@qJFz!87GA
zfLc)c&!9$>zSuZ(e9}2fUpvj`ce8x{`hw3N$~F7{^Euf^VCB?4s{ALDb6n?@+#9*W
zYRNWsf@Zs}+5WAJv$UWOzx171;H%BC?dLVHT`$?jUeG-d+h?2VWh{p}Px1=Mt0XHV
z#QDJL5Zic!09n08<*OvuNQema2FaTwZ;@Pw%mGb50IEWwfi}p}KobXzr5T`YI#Z`a
zJNkg_CBei9vp|3Cr;yjkeN4H|9%HWC5a;?|VFG%h=>JK*11Usu3iC@S-$qJl0H-l0
zz%QLd{qI5j81*Jzi2hgbKahmosMRXGR;$~S2OYBgR%`zt>`XlBEc(zN21UC|QQtG$
zjy8$X-wqoVO;}2E<uZIVT=$xPQBirbVFym{;iIUXrAkk-o?3l==u?9#Es9#W8<W@C
Nq!mu7!DV(%{0kZKVu1hv

delta 819
zcmZ8f&ubGw6rMLTyV-2hG+NstD6LB)U8|newjj13N(n+yF{H@aS<;wf)6Q-JT{cvR
zhzAeGy?AUrdi5Xh>dB+9|3MFe=bn6Td+^7?eDBA+@4cCC_U+7@a=AA-X*2xZf4%jh
zZH~*ARve5JQ_x{us6&_6Ik5XoaV1_eB}Tk1l-y#jaY8hgXR_8)epVnH$CqJo{IN>=
z*7)1}GWCjB0wYM+b7(R|o})<EkvwLAldu+Qu941zn{LC>jS1wOuCCu{JPv&wHXeFG
zD{O4|VLR&WH8y)YUS})vqJ>8X(QYqDKf|J7A;V68fO9C(E8tqk6@EfU*h_W<3XWlj
z<A*$f4Ys{86pANe!1Q$`a(gwl@IaVrVkNMrY~Kbv9Iyy4JHpH}%q09sCW7|&ZDr)V
z^|+Ap_!%or_}si583`YOGTTzu{^8J73u#H*maeJIREulMm73(wj7}@?!+J456*tMv
zBxN*-aRw#wiU?F6E+Ldaa*JDF0f!2hP=XRh9Lnh1d29oJC4Z&M()se!`~Zg;(^E){
zWlOC&CxGrLIGSv1bb7&>gT{-{6bC4ME6+?st*#$NUUv`k6Fa+J(DXx}ii|$BiOoK~
z6NRgh*IbB28+|cYb6iUs*jZNyIKfSN8a+)Q2rdxN<GEA03VH_px=9*5P<l3<E<UMd
zqU|4K#=z_J{fr0E|B9SL%9Zq8@gA7z_hR+#B=sbjH0}IVohzA(NIwb94{5Z;P(ZUZ
Zrzu-=Wx8Ttto%{^jFkrVtgNu}{5Kmws^$Oy

diff --git a/__pycache__/places.cpython-310.pyc b/__pycache__/places.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a1cc823d5c63f0741dd7148ce531dd54ee487f30
GIT binary patch
literal 1291
zcmZuw&2H2%5cb$kHf&RV%D;pV2RP(XA#p$;gg{gv5L%F0E~`aRSi4KwY_hf8LRYDT
zR3yrQH{j47c>rF8L#~{-bK(LsURG=YM;_bb8P7N0Ose_$HpB7d^NknRBx7IcFgpYu
z?%=c+Q7ERMU_<Bvum?<WCEhY6c6pa8xy+K_8``i0ns)B=aG;&jrcbKb!SQehr@f3q
zvo0ux?x6Tv))h)9iK|qB3ULio3!jaeVEJV=vVC%$4%*YahtpCDHPkFcgy;Yr#2_j=
zOn4)$E>^oT#nUHdLNxqw{oc*qGpmj5J<7`5_MVh_$>dwQx1{a5t46)YRX;24mRYeq
z)}}Wqvc9&9qwOY2)4a@Gnj%rmQuH>Ak9us2)2lw9dOC<avh^UJ;%2~h5at?NgC+KS
zeuvk54Rc@T=41`~0#EV)soe;@P4Jh^l|we?YQR)^2Qx%+lF(3~X0EK1UdaZJbL$$h
zuD6>o8;x|SnqVs{Hg(f}m2LmNPlO4`C!z-?4lWybjwYhzU&K1zEef9{DeNf}5@Ozl
z82Fp%Dq(zL!o-aIAu<RbJwT+`*C=YX&km4~0eg?tGdJI{Rq%}vAu&YIr5)j*7Q0AE
z&1tn)9Vp@O7ReF^unT7y-R`k{S&OMw$&cLAc-#eh%!Ml01r@5+2eCZqkEnA97!{I0
zog`qFQ0y@bK8KY;IOh>2)@L5D-Iv)0wmh;fk@Yeg>XrMRsDzsZbZa2{1l=S3YO{1p
zdEd>D80Ge1NxE|sgW5Gh_Cnx4B_Cg&@aFxVtWFNM3hF_7dvWU6h)k(zpupRjv-r*m
z>gFhT%jhlaX`Qsp2|5QOlb6^7)){YTV$z1TGEOT)IVaNB-yFleIZfgS3HnD271{Xu
z$FsORMU+DX5+siy3L}W%41WC00?6;<g@2RjBq9AeL|B?O?KB-$YO|nyoTeL_SuwdW
z5yd3z<^l<i<BuRPhRWpohioH65s5hV+D;<6Q8m&gbCvPwdG-HZX`)*b1h?s5wbYj}
HTj0L{+I|;w

literal 0
HcmV?d00001

diff --git a/__pycache__/publicTransport.cpython-310.pyc b/__pycache__/publicTransport.cpython-310.pyc
index 0d563c57016949bf8d3e322ed82b853939f218c1..49463280aabd75d0b90a70001ea26bbd59858c97 100644
GIT binary patch
delta 58
zcmbQp+sVtF&&$ij00dRjEjMyoF)BDXTg8MHrxq2*cqQg#7RUJKrMeVlmZiqHq!wqF
M<QHttWmI7W0L_3Ar~m)}

delta 66
zcmeC=oyg0b&&$ij00h_1T5RODV$|?(wu%WYPAw{q@k-3gERJzWEzT~<FNpEUPfpAU
UE=ep=2&gQ{$j{rH%BaE$0FG}JPXGV_

diff --git a/main.py b/main.py
index 8917dce..74637b9 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,14 @@
 from osm import OSM
+from places import Shops
 from publicTransport import PublicTransportAccessibility
 import requests
+
+# 52.9152386,,15.96z
 # bhv 53.51500036203292, 8.603602165157444
-lon = 8.603602165157444 # 8.6039883
-lat = 53.51500036203292  # 52.51608
+
+# TODO Get User input
+lon = 8.8285578 # 8.6039883
+lat = 52.9152386  # 52.51608
 
 # TODO Get real value based on a metric radius
 areaHeightRadius = 0.01 # 0.01
@@ -21,18 +26,19 @@ requestsUrlParams = f"?bbox={minLon},{minLat},{maxLon},{maxLat}"
 print(requestUrl + requestsUrlParams)
 
 print("Downloading OSM-File...")
-# TODO Check if banned from overpass-api 
+# TODO Check if banned from overpass-api MAYBE get alternative API then
 r = requests.get(requestUrl + requestsUrlParams, headers={'Content-Type': 'application/xml'})
 print("Done: Downloading OSM-File")
 
-
-
 osm = OSM(r.text)
 pta = PublicTransportAccessibility(osm)
+shops = Shops(osm)
 
 print("Bus:" + str(pta.isBusAccessible()))
 print("Tram:" + str(pta.isTramAccessible()))
 print("Light Rail:" + str(pta.isLightRailAccessible()))
 print("Subway:" + str(pta.isSubwayAccessible()))
 print("Train:" + str(pta.isTrainAccessible()))
-print("Monorail:" + str(pta.isMonorailAccessible()))
\ No newline at end of file
+print("Monorail:" + str(pta.isMonorailAccessible()))
+
+print(shops.countOfShops())
diff --git a/objects.py b/objects.py
index 892fa2d..3639210 100644
--- a/objects.py
+++ b/objects.py
@@ -12,7 +12,24 @@ class Node:
 
 class NodeTag:
     def __init__(self, _id, _nodeId, _key, _value):
-        self.id = _id
+        self.id = int(_id)
         self.nodeId = int(_nodeId)
         self.key = str(_key)
         self.value = str(_value)
+
+class Way:
+    def __init__(self, _id, _version, _timestamp, _changeset, _uid, _user):
+        self.id = int(_id)
+        self.version = str(_version)
+        self.timestamp = str(_timestamp)
+        self.changeset = int(_changeset)
+        self.uid = int(_uid)
+        self.user = str(_user)
+
+
+class WayTag:
+    def __init__(self, _id, _wayId, _key, _value):
+        self.id = int(_id)
+        self.wayId = int(_wayId)
+        self.key = str(_key)
+        self.value = str(_value)
diff --git a/osm.py b/osm.py
index 61f889a..d4be465 100644
--- a/osm.py
+++ b/osm.py
@@ -1,16 +1,19 @@
-from objects import Node, NodeTag
+from objects import Node, NodeTag, Way, WayTag
 
 class OSM:
 	def __init__(self, _osmContent):
 		self.osmContent = str(_osmContent)
 		self.nodeList = []
 		self.nodeTagList = []
+		self.wayList = []
+		self.wayTagList = []
 		self.parseOsmContent()
 
 	def parseOsmContent(self):
 		lines = self.osmContent.split("\n")
 
 		nodeLines = []
+		wayLines = []
 
 		for line in lines:
 			if "<node" in line:
@@ -29,7 +32,39 @@ class OSM:
 				nodeLines = []
 			elif len(nodeLines) > 0:
 				nodeLines.append(line)
+			elif "<way" in line:
+				wayLines.append(line)
+			elif "</way>" in line:
+				try:
+					self.createWay(wayLines)
+				except:
+					print("Way could not be inserted")
+				wayLines = []
+			elif len(wayLines) > 0:
+				wayLines.append(line)
+			
 				
+	def createWay(self, lines):
+		wayId = ""
+
+		for line in lines:
+			if "<way" in line:
+				wayId = str(line.split('id="')[1].split('"')[0])
+				wayVersion = str(line.split('version="')[1].split('"')[0])
+				wayTimestamp = str(line.split('timestamp="')[1].split('"')[0])
+				wayChangeset = str(line.split('changeset="')[1].split('"')[0])
+				wayUid = str(line.split('uid="')[1].split('"')[0])
+				wayUser = str(line.split('user="')[1].split('"')[0])
+
+				w = Way(wayId, wayVersion, wayTimestamp, wayChangeset, wayUid, wayUser)
+				self.wayList.append(w)
+
+			elif '<tag ' in line:
+				key = str(line.split('k="')[1].split('"')[0])
+				value = str(line.split('v="')[1].split('"')[0]) 
+				wt = WayTag(len(self.wayTagList), wayId, key, value)
+				self.wayTagList.append(wt)
+
 	def createNode(self, lines):
 		nodeId = ""
 
diff --git a/places.py b/places.py
new file mode 100644
index 0000000..c6c210a
--- /dev/null
+++ b/places.py
@@ -0,0 +1,35 @@
+from operator import itemgetter
+
+class Shops:
+    def __init__(self, _osm):
+        self.osm = _osm
+    
+    def getAllShops(self):
+        shopList = []
+        
+        for tag in self.osm.nodeTagList:
+            if tag.key == "shop":
+                shopList.append(tag.value)
+
+        for tag in self.osm.wayTagList:
+            if tag.key == "shop":
+                shopList.append(tag.value)
+        return shopList
+
+    def countOfShops(self):
+        shopList = self.getAllShops()
+        countDict = []
+        
+        if shopList:
+            def isInDict(name):
+                for a in countDict:
+                    if a['name'] == name:
+                        return True
+                return False
+
+            for shop in shopList:
+                print(shop)
+                if not isInDict(shop):
+                    print("add" + str(shopList.count(shop)))
+                    countDict.append({'name': shop, 'count': shopList.count(shop)})
+            return sorted(countDict, key=itemgetter('count'), reverse=True) 
\ No newline at end of file