From 6bee1fb352ed4b61fe50eea9f1b133ed5c4ad32e Mon Sep 17 00:00:00 2001
From: Janis M <janis.meister87@gmail.com>
Date: Wed, 23 Mar 2022 15:07:19 +0100
Subject: [PATCH] merged shops and amenities to places

---
 __pycache__/managers.cpython-310.pyc          | Bin 1203 -> 1594 bytes
 __pycache__/objects.cpython-310.pyc           | Bin 1805 -> 1801 bytes
 __pycache__/osm.cpython-310.pyc               | Bin 3252 -> 5777 bytes
 __pycache__/publicTransport.cpython-310.pyc   | Bin 1681 -> 1583 bytes
 main.py                                       |  12 +-
 managers.py                                   |  26 +++-
 objects/__pycache__/amenities.cpython-310.pyc | Bin 0 -> 491 bytes
 .../__pycache__/baseObjects.cpython-310.pyc   | Bin 0 -> 1933 bytes
 .../__pycache__/metaObjects.cpython-310.pyc   | Bin 0 -> 1379 bytes
 objects.py => objects/baseObjects.py          |  15 +-
 objects/metaObjects.py                        |  44 ++++++
 osm.py                                        | 136 ++++++++++++++++--
 12 files changed, 199 insertions(+), 34 deletions(-)
 create mode 100644 objects/__pycache__/amenities.cpython-310.pyc
 create mode 100644 objects/__pycache__/baseObjects.cpython-310.pyc
 create mode 100644 objects/__pycache__/metaObjects.cpython-310.pyc
 rename objects.py => objects/baseObjects.py (76%)
 create mode 100644 objects/metaObjects.py

diff --git a/__pycache__/managers.cpython-310.pyc b/__pycache__/managers.cpython-310.pyc
index ac619741518a37a8e96b40073f6daf21c91ac664..8a3dabe14f2860c85caf53d09b5ee62f24b0e8f9 100644
GIT binary patch
delta 693
zcmdnYxr>J{pO=@50SM|et&<E{Ci3Mn>P)PWl}=%6VTfW)VNc-z(rhW5!3>&Qw|D|_
z5|dLWF7{Wjbhe5KElw>ej`2#&%PfxZ&r5YF$}CHbaY-%CF3B&LEX8QRCJI)**`HB@
zQ5$4OF^J$`<Y8oEWcts-RHYA=_f5=8OiwM+OHVCv&M(a?DV{umDc6Cu0Ay7WJ5Wav
z2aveMX_KCsms(L!WG4(ViUmk8HApd38Q?I)irJO@7AM%0$*s(8LIQB}{nJ7!3sQ^O
zC*NU~u9wBG9jYdo31|%rfUE>zXCVHp1tiiLYME*nvKX=$T^M3{YME=8vzTfavzdy7
zYM2%Pc?%gC84B5In1UIKK>9RUidcbEkqC$Y1x1l4Lp@lS4JLAntthp)G^eD98zchu
zJR$`6fj$7cw%Dl><O6Y_n$J8yf(00)TtLXw01Q+abPpkG!SGK#%tJ+zARE!0d5a}4
zF*g<HPJ}aMLF%MH1R*#20kz756v_Yz9PZ)*`URxUPm_JJ7>gFS1W3I!h>)A?$fC#x
TPBFkV!@<lUz{4>)hs7NL_#B~R

delta 283
zcmdnRvze1GpO=@50SMTntdiC+P2|gEl$lr~%N5L^$##o7I3vGc;ue1mM`x>;(Bjmh
z;ux>Qyv*Vlm(=3ylKg@gpZw&+oZyng5`}=ul8pSk$;yldtRf&?n<E(|7&W<p1{Z^j
z=V0VvWMgFd&%#ut3zGIt%u7s9Ez(O*Epg5-%`2Hahbfnpr5GqPnV(rySp=ky1xPS8
zNHJ9DVb$Tu?8+9!0oF2=*-eliW|V(gNM%84F~{V$%+m7G*t9}b_-V3E?q}6v6rX&A
SRgsGg<Vuh`StfsGbq4@J)l!B4

diff --git a/__pycache__/objects.cpython-310.pyc b/__pycache__/objects.cpython-310.pyc
index 0d781e7c9ead13790ff520ad530785866bc61c77..7061d6058ef2f4045a07b17a5aebbbfc1c75e128 100644
GIT binary patch
delta 388
zcmeC>>*V9h=jG*M0D`VlR!M1W8~J1y6)c>sVnT~ki;82s67w>PWBl_{U5YZxQe#|F
zi?d7e3nm9KDl_s-E@MpM2Wc&40TLVxJWNGQljpFgZ02T?W@Hqatj_EtEC7@d1me$7
zC5%M^ASILMFh^;F#EXQ0#4WbG{FGGBlp<jehdDd7@)m1ZVoqtQCTkHpNRjkpMHW3q
zxyb=6j%>0Z0maGFStfhJ4FGE_5(CMIg9r%_AqgU+fP^MH)D)0_42S@mAqQf~g9wGm
z2N{J~xq(d8$=$4u+$tbJMG&C{cI<CfT@AQhw^+*)E1_;JQUxhe0}=?A2C!)|>QAm>
ivyjk(8>0<m`2m$MfkXr*pJKD(<m6-L<Kbf$;sO9EFG<}1

delta 386
zcmeC=>*eFi=jG*M00K?{tE5vb8~J1yH5{C+VnT~ki;82s67w>PV_Z^;vrF;|Vtn$G
z6LW$~5=#^UDoZl*^Co*SDl;-o&SOmCWdxe=nFUC2Fz_&LzRT#y$jC8Sp4o|C5GckD
z#6<!iLU8hZMwQ7kn4`3XKwM!Uaf>Z4KPA;OrAP$CVa`siyv16Um{Xdn$yx-~C^K1>
zMUPQrvJZ<RH%J4-Bqgv(dswnO;U<AiC=v%LkpK~rAVLa6NCOE?cBpY60a*|s2O{J_
zgaU|AoV<}$n3WsIl%Cwq>c|GxDKPmQYnTSyid(GZiIq^d7O8@CsR0RuOMTch8C55j
lu~|r{fF!|w)&{ctfJ&G^B7&2Tu~~64@Uijn@UaVV0RX?}O633m

diff --git a/__pycache__/osm.cpython-310.pyc b/__pycache__/osm.cpython-310.pyc
index f7ea589f67ff93b3d05ac08e1cee610e19f9fb7d..c42c4b98eb8e064a70d5ebd0847c807684a296b1 100644
GIT binary patch
literal 5777
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
Hi^{(NPPcvc

delta 1228
zcmaKrTWb?R6vt;~XOl@x(sYyBi?NqztFg8!C>CkGP(kV?DpiCKiLtxd*mk#_U6quL
z3JSg&=S>hQK8WChqEEgFiZ8zSy5c7gzkpAkvymE9++}{8nX_~G|L1IT>`iaVNhae2
zo?7pL%kPuTRE~}}M+dUUh{;Ut9x=7MtQ0Z%EGg(sd#lc8=bh!|i$1!y`EehPCRCa}
z(uE7d>LneU>x8v_OimvtpLZ?kmXBBMnp-|<xeK1NTt4Z{RTpQysyBG1?#(-PYv71o
zU97KKvh27^<ID9xR4O&Q=2a>j)^byTIE}2o3Ho}1DN1ANlQu!qO6Mb4+*F1zFzNs#
z)geB=F9uNr+B7ux4d5ziFq1YkXxyhq$;Ii0ZZcoLLF9x-e0`0Yn)+;H9%eYz)hnZW
zH0no8vB2aWKibe%1oUFi+YddyBFuO=^@PvXU=cNx$!>c>DOnMo<};uB+Fh+7d~%IL
zT42T`=vgr!>T9I`cEHiMfZNq2Yn4yh=HRL>tt(Ucf-VJ|R(2!$5U4_;7loKiW4swq
zirS88&6sY$z522xM=;S32($&O9_Tl!i`T7yx-D<k4GQ9O(yDsaA-v38@VT1@aLy^G
zf(e>~SFi{b&}Vl9?FS}Uny#i!&z>4@&Bdw8@966}M+pHpS?K0daF+QRxM{1V@myU<
zkI-l8R=P6!%qMHYr=dGMbRk`o19;wzfFHbOPUR&YLvB$6ol_SEF&si{MGON#`EOIO
zHe>=3+M{E%36VsM0t(4Cqx75A`iv?2)!WX)+qUB;1we`2^#1Th=3x97G<UliGKM2@
z(9XZBGe#lxpk3*^*Y}MsN<XN_naYk2e~B}GiR;3xb|QXhJDBahJ%;^p1ez~*BlaK$
z5&sd*Fps}$OSFbjD0%}%q3Dh_(UDelgcZ>$m6MKLimET!nf$s30ki+|pa+(#sGQNK
zE_G#lLkqsOUw#p)u2>MN*)@DNgInVt7w#Y0Cvkq8uj_>;qmaN;yLfYg2r6PCFM1L^
mVWwD!mZFXt+BmQ~?Eh<tKuj(<=JiGEAlwFVu?%v=U_SxdANRKa

diff --git a/__pycache__/publicTransport.cpython-310.pyc b/__pycache__/publicTransport.cpython-310.pyc
index 1ba5809e369748e0eb344db0db617e8c3870e02a..8be78c3a32c2076d09dd0729c2a0ba9f14a6a68c 100644
GIT binary patch
literal 1583
zcma)+QBT`25P<C@P1Dk@P+-%fNqgd<5@Q;VXqsSDOqv**M)wkRveMXqX_^!}VQSS$
zlg88j34dijA+P%hyzOasDW$-m!IAIm<nH|4Id)X7mI<_9zc)JT1w#Jd<a#q<vI$++
zLA)cJaC!#)r{NNA?30G+!}}Y}fY~N=-2@?sOF3~3PPuVLT$7vJ0&VdEw?P+pkvpJm
zUgBlYMLx$XpdDW2k3g4r4c3@XpM6R?f%IF-3w1wI@s{rktz}0BG9LK2;-uji`!;lq
zsg3A}FyMwbbgw~EGt#|=ky=^=2dTwic1{#zPX2CgZ?wN?p>+Gb7fRj!7>cHnr=r~y
zx*JFR_HN{R!B*%6gP~CE{!OH{{vdT2lc9_mvv769DAVD}EcUgDhfl$J($EtNk4apt
zf*6rwa!i}#YwbH7(PJoQ*HDWvGP!{xO1QaCPAqOgnuR^Lcq9*xzIg-J=_HzIfN$-b
zTMFZ*b790q%RAhaI!?{57^H<$FG$3>p>WOAjJ?CGAY)<UyPDK*6FsSVAd2wv0;^l0
zOVp;u4~q_0XXbe;z`f}z2ckj>X;FDHz!XZc@_Ls!s1kftRTQ{o*9hmOhQFgXMa+!m
z!D#p*2kfR_E}2?@plMOZUM!=qwR1nyLdGP+DbylDXHaYTP}d#vsW7x#4q)G7hNYVY
zwk-878h!@5DcsX5xb+;kJDeW~XzQc{n>q`wF7<w9G$ng}MfNg>?6&6vv7BBMMtN0R
zlKR7?*%WQ%3hh-6+W)?LjWS*tq1O|PrDeu?5l;dfR~S1<ykPuA;b~Jf6nF`%B^1jj
z9;0}IVtN{~5guBFHwvD3jX#`29K$gkd;C=F>?_=dnZC<CbzYBg-e8>UGON>nn?-rz

literal 1681
zcma)+OK;Oa5P)}W$9B@RO<%kZy?_*{1i=X*gj!k^gxXM%aIu0c$7|Y6{YZBmP@*6q
z(Ld84!x_m}PMmw=#EjiEX=&qbw6n9GN50vyH=3O-5g5OIK5wrV2>Feh$)Un#9j2^-
zV1!Yh1k|Dwb;VZ#)lvh^(kOXDn98(c!n7ZXRbYh%sp@|qhE!>yzHjVSl|-vY%u5WE
zO=sUl<K$3avkp^kf$)e$8L<>bnQ}}lHA`-3tiW{G7ns3JSanupC0GqM!^*IlY?jTz
zT4eJ8P)Q!__1Zpno5BfYHxluN>v~f1Hurhlckv%b19hC6FeRSJkPe9rWkMcW$08yb
zU=h;uKPQ?EyAvXc;Q06L=8M)x=?U3-=Y(9gwmf+lN8Q#=<T`#McH-5&etZyx*@KPH
z@%sZ$w7M73YTbTf+BOe)Y}?QZA`z!V2M?#!P#Z<K6ud_RBe8Q>%;_44A?c6~-6Egn
zztJJ>z_A`GVhJ>rDX2j|)do4zm<Ht*>Xvc9_Yb~0eame3q%EPE=JtsubV!xVgjoZ3
zxQr9^(Ca6KFOJ{yP84CFU5%an^k6c9XPL}%`MM`Zr|)|vJUm59nJ!bED&I9aSeshs
zr3BZOE6R`+N=OXha34!3#=;5CY7nzv6$>b^brXaYF5xW+#)xxhUj{LFoC9_-E|*NK
zK+?pJ@M7>NY;IrAw2(6Ka14b!8B{GFYBDgN>NcddN<Q>Gw(;nufvs@4gN`4-Zwz<u
z9PU{T+!et$1k`1(4NaW}x5#B9bsCeco|8SvA-f!TLo73h!YJ?5mbu(La~q>QI!Ak&
zgZ6)Hy;{O6BXk1Kwv&==2NCP}sF!W~sOR{ZMa<xTETOoC;tq<tDAJDIM{WEyq#Ayj
z0xuyArmTQ4iAhb>)U#h%Pp$Q;p56%pFPy}P+8xi0rNFC4U}WlaRqn)mnX$gYYfIw2
KQYIC;sQd$8YmyZJ

diff --git a/main.py b/main.py
index 8412795..055b7ab 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,5 @@
 OFFLINE = True
-from managers import ShopManager
+from managers import PlaceManager
 from osm import OSM
 from publicTransport import PublicTransportAccessibility
 import requests
@@ -46,7 +46,7 @@ else:
     osm = OSM(r.text)
 
 pta = PublicTransportAccessibility(osm)
-shopManager = ShopManager(osm)
+placeManager = PlaceManager(osm)
 
 print("\n--- Public Transport Accessibility ---")
 print("Bus:        " + str(pta.isBusAccessible()))
@@ -56,11 +56,9 @@ print("Subway:     " + str(pta.isSubwayAccessible()))
 print("Train:      " + str(pta.isTrainAccessible()))
 print("Monorail:   " + str(pta.isMonorailAccessible()))
 
-print("\n--- 10 Most present shop types ---")
+print("\n--- 20 Most present places types ---")
 counter = 0
-for s in shopManager.getCountsOfTypes():
-    if counter <= 10:
+for s in placeManager.getCountsOfTypes():
+    if counter <= 20:
         print(s['type'] + " : " + str(s['count']) + " times")
     counter = counter + 1
-    
-
diff --git a/managers.py b/managers.py
index 6a8931c..170acfa 100644
--- a/managers.py
+++ b/managers.py
@@ -1,6 +1,6 @@
 from operator import itemgetter
 
-class ShopManager:
+class PlaceManager:
     def __init__(self, _osm):
         self.osm = _osm
     
@@ -13,9 +13,25 @@ class ShopManager:
                     return True
             return False
 
-        if self.osm.shopList:
-            for shop in self.osm.shopList:
-                if not isInDict(shop.type):
-                    countDict.append({'type': shop.type, 'count': sum(a.type == shop.type for a in self.osm.shopList)})
+        if self.osm.placeList:
+            for place in self.osm.placeList:
+                if not isInDict(place.type):
+                    countDict.append({'type': place.type, 'count': sum(a.type == place.type for a in self.osm.placeList)})
                 
             return sorted(countDict, key=itemgetter('count'), reverse=True) 
+    
+    def getPlacesByType(self, type):
+        result = []
+        for a in self.osm.placeList:
+            if a.type == type:
+                result.append(a)
+
+        return result
+
+    def getPlacesByName(self, name):
+        result = []
+        for a in self.osm.placeList:
+            if a.name == name:
+                result.append(a)
+
+        return result
\ No newline at end of file
diff --git a/objects/__pycache__/amenities.cpython-310.pyc b/objects/__pycache__/amenities.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..eae9fdaa216d9da2999bd526248b6f58f6350490
GIT binary patch
literal 491
zcmY*W%}N6?5S}F4AJ-P7i0{x#A3#M~TM$L+LA)%1u-!yh-R{<8D{R?Y`!c>#uD*pQ
zXSNpV!1pDSnQt=56#ae(XtlUnXa?|2&anw}#t1h+x&sZG?GRfYf#%OJ6bYXHGmhRE
z;m(l^L`*}(HPd_tk<bD)f$vO~CQr*M2{7kiv?uWt;VzJBR)d0?BePl{a}6kG^P%va
zywK)eJ0FzQ%J?9Umj(+5&SbB?s}9kYYQil=@h`9^SoY_3dMRI=u}(h3dFtd-Ze}+9
zG;(I#ds(dHW0Az!B#*OdW2`I|Zzd_7#0uDRYTRg5;T0-HPpLL_OVnm<7P8IR-_u5i
zggLf_+0=kiK2&O1=ygW>o>Cv{INL|;Db{HEJ0hBm#j!vO;pl_9&|}TXe7IkavgvV_
RB))sSzvPCrjy`n|`~oK~ZfpPm

literal 0
HcmV?d00001

diff --git a/objects/__pycache__/baseObjects.cpython-310.pyc b/objects/__pycache__/baseObjects.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9d08c78efa82e24150167c7a47a4225fa172593a
GIT binary patch
literal 1933
zcma)6TaVl{6i#C2GU?1vm5apvQb2^u!ZRSWs4GD$G(~DFq-Z278=EC`HW}>9qFK#b
z`)Bqq`IR?bSG@4Vcbv&g3N2kn{&bGxb8LU#v75;x_0ayh`PK2Cq38WU&ag2!hv?=G
z;5$!x(tnKpD9FhRB!kD``S7?5;f3%5c#(|Z#qb!sM2_H%;BlGW^RjCt@;%XZE4_kY
z<>kKg@&Gw$4L@hnM^tFT9~VWbW@S8xB|AXBg>F6qZ2XNUyiEY~Hw+kTIFM~ZAm2p5
zP<r>g3xAeHHm)0~ZcAf%yIv~G>*7?|xR6pSV{BYDbz79J9XCr=SM|yF%}Sdrw%n-2
z&v_!Y(RnCbcqk|y<J$zVwi)t?7^b-J^fm1D@1t8^&L0@1&HPSLS7v^<R!6!zQ}ZKb
z9=6SL{zFq1i*M^<u|8LN-W>m`%GS(}3#0CK_Q7&(6CtX)YK0&<%@`2*{g?XZQ%BoD
zKPh9g+3bQ-6zx_Bn+kE-$kl@Eu@JwlibeNFPms&)bO4lJ`+yO;;ef=O`flVux{@-7
z=$9`6cDnj9c<ez{235J`Ge}TUvc8eM)AT-^7OFlXUHvxL1kPfxn6o%6?yL}2=&T44
zk+Wi0v9l8VO`J6%{WYzSrIuB7YlBK!W?F68qNxEzYvVJ>Qo$Rw)u}RVak{jl@|U7M
zQAV|vtq{Uj&@LNk+OTD!k~tShK!^;9=u@O(pCc9fBwSFIP*9qGGfdRKh;FU}Qh)eO
z{qqTtwv%+Gr<gRzK*gn<P?X{Z`ei57*w-}jOrbQ*g(xxQzh9h`co%k!>|U44PvH!7
z!Hsj=1})p^!g^iyd`FrpLB9;JQFnVZ-FeF%s<jQzip5H0p(9kkh4DPz-Z9Gs&4`4X
zGB~O`C6V<u`eg#>r~*mXw}-e2PahzV7S!((koR1U*iXg!*>BMyQVjTcTHSg*KbY6o
zZP3^4p0i}nnd3^oN?Ux5;B|sG2;Kx_@t!zMbm(^o-X(aC;3k2qjeUU-bswU;cVk~=
zpl^)xU4^>O5KV-2)RFgG>LR56zv|Moqwa<dD<=HCSl^Z%3G~+M4Ddv`M53GWG5!67
z;3>!bg2t(S&tK^Fag|dZVE*S6=n90q8CIru(A_9kGMWyr>EB@49o07Zx_f57p(sO-
O^)#7|rsHXRBmD=;*?YhM

literal 0
HcmV?d00001

diff --git a/objects/__pycache__/metaObjects.cpython-310.pyc b/objects/__pycache__/metaObjects.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3b8b29200c1e280af6d9a2d3e4e7f1a3761a06c7
GIT binary patch
literal 1379
zcmaKr&5jf|5Xar$-NWtz8$trg#|DYRTsUz8gh0Deq$nB=t4L96B+K3H*>$GJZfy4~
zgZdU81aaF}@-=V4g_LV%hslcImVc_UtNtz9Rce2KL}2{+!_(?RLdZYf*&Pu$FJPJ@
zz^|ksP4Eup-(l&!u!+EnzzdrAl#G)aqW&|s`FCNN6Nn>a*u<C_lu;A-ESDWCX<2P2
zb-I)7?GWZMO!FQv1OuUD2!X*60mC5%MneLO8v;y_DKbOm$O1V+-azgl_mKz4o5)+p
z+sH%YH^@84Z;^MA-yy$8-fPGyxeO-b`!4CumE<m(u{SQ^3np5ZUGT~X%U!xqm1w!k
zXRPLxQgatB=dKXaSazn_!e#bCSj)A`R;sss#a#$NDdg9%n_J#;jLR?1nKi8IT;2*f
z=Z%oA=!Aq+Zmdg|q63l9O!eBl?wRH;G4oZ&UHnGKGZ!t-XD*$!qMmD)FPO2aQPM?5
zfM6q->6B)!IFr3mwP5Wyb+O^?tV}7Mu8b)h4?H|ynbXYy%Z#p1cuDk6@M0fNj-O2b
zFkGAIZ%hg^eI@yc7E3-o;bv}CH~n4JtbHk2yL!v@R8@cR+M4NtTlQ*gKk8O4r&LH`
zDfQ)G9s|-~`-NNU^V%1zQSkQGrpz8)$&HhVAD6NJgJcU%sT)x^Lesb2-lG&QuU+rx
zBls_#Y6n02wE*C!i2*q|2yo^9d*MEWUG+i{6wo`@`{8BNz&n~rjok_1et3J^4^P1P
zdOr-Q?}s4+rb7<Qh5`uva7wh-85i!xx#|s<{i1?uNsZN<L-BMiRHut;Vd3gKWo)e)
z?y_3-(&`n&^;NGcs3^;zrt?m#rI0lrkMxfqTkg>vRj7!ytS=p}TPD;Cmj%62hVt1+
z`(V_DU=;UJ8};j#egwaI0Mi@-(rZQFAA56$pC7xx$M(>_K+cY!FIA0C`4B9>X>veL
g!XOL|K54%?8Hf0+=zJ;H<<HiI^L$$i2juYRU%C)l`Tzg`

literal 0
HcmV?d00001

diff --git a/objects.py b/objects/baseObjects.py
similarity index 76%
rename from objects.py
rename to objects/baseObjects.py
index 60104ef..e5f4b66 100644
--- a/objects.py
+++ b/objects/baseObjects.py
@@ -1,18 +1,19 @@
 
-# ! "amenity" are used very often in osm it's referreing to healtcare, police, cafe, pub, ice cream, post etc.
-# ! There is defently a need to sort them more on not just take them all into a "amenity" class
-
 # TODO new objects: healthcare, police
 
+# TODO Address object "addr:"
 # ? offices 
 # ? How to handle districts
 
-class Shop:
-    # TODO More optional details/attributes. Example: "website", "brand", "Telefone", "Owner", "opening times"
-    def __init__(self, _nodeIds, _name, _type):
+
+class Place:
+    def __init__(self, _nodeIds, _type, _name, _address = None, _contact = None, _openingHours = None):
         self.nodeIds = _nodeIds
-        self.name = _name
         self.type = _type
+        self.name = _name
+        self.address = _address
+        self.contact = _contact
+        self.openingHours = _openingHours
 
 class Node:
     def __init__(self, _id, _lon, _lat, _version, _timestamp, _changeset, _uid, _user):
diff --git a/objects/metaObjects.py b/objects/metaObjects.py
new file mode 100644
index 0000000..f263671
--- /dev/null
+++ b/objects/metaObjects.py
@@ -0,0 +1,44 @@
+class Contact:
+    def __init__(self, _phone = None, _fax = None, _email = None, _website = None, _mobile = None):
+        self.phone = _phone
+        self.fax = _fax
+        self.email = _email
+        self.website = _website
+        self.mobile = _mobile
+        #Social
+        self.facebook = None
+        self.vk = None
+        self.instagram = None
+        self.twitter = None
+        self.youtube = None
+        self.ok = None
+        self.webcam = None
+        self.telegram = None
+        self.whatsapp = None
+        self.linkedin = None
+        self.pinterest = None
+        self.viper = None
+        self.foursquare = None
+        self.skype = None
+        self.xing = None
+        self.vhf = None
+        self.flickr = None
+        self.mastodon = None
+        self.sip = None
+        self.diaspora = None
+        self.gnusocial = None
+        # TODO support custom social tags MAYBE: there should ne no need
+
+
+class Address:
+    def __init__(self, _housenumber = None, _street = None, _place = None,
+     _city = None, _postcode = None, _country = None, _suburb = None, _state = None, _province = None):
+        self.housenumber = _housenumber
+        self.street = _street
+        self.place = _place
+        self.city = _city
+        self.postcode = _postcode
+        self.country = _country
+        self.suburb = _suburb
+        self.state = _state
+        self.province = _province
\ No newline at end of file
diff --git a/osm.py b/osm.py
index 4465189..8c5b786 100644
--- a/osm.py
+++ b/osm.py
@@ -1,4 +1,5 @@
-from objects import Node, NodeTag, Way, WayTag, Shop
+from objects.baseObjects import Node, NodeTag, Way, WayTag, Place
+from objects.metaObjects import Address, Contact
 
 class OSM:
 	# TODO Average value of "last updated" to see how up to date the data is.
@@ -8,7 +9,8 @@ class OSM:
 		self.nodeTagList = []
 		self.wayList = []
 		self.wayTagList = []
-		self.shopList = []
+		self.placeList = []
+
 		self.parseOsmContent()
 
 	def parseOsmContent(self):
@@ -45,29 +47,129 @@ class OSM:
 			elif len(wayLines) > 0:
 				wayLines.append(line)
 
-	def createShop(self, lines):
-		# TODO Make sure shops are not duplicates.
-		# TODO e.g. REWE(shop) is big enough to have some "Ways" of it's own and multiple nodes, which can cause duplicates.
-
-		nodeIds = []
-		type = ""
-		name = ""
+	def createContact(self, lines):
+		c = Contact()
 
 		for line in lines:
 			if '<tag ' in line:
 				key = str(line.split('k="')[1].split('"')[0])
 				value = str(line.split('v="')[1].split('"')[0]) 
 
-				if key == "shop":
+				if key == "contact:website" or key == "website":
+					c.website = value
+				elif key == "contact:phone" or key == "phone":
+					c.phone = value
+				elif key == "contact:mobile" or key == "mobile":
+					c.mobile = value
+				elif key == "contact:fax" or key == "fax":
+					c.fax = value
+				elif key == "contact:email" or key == "email":
+					c.email = value
+				elif key == "contact:facebook":
+					c.facebook = value
+				elif key == "contact:vk":
+					c.vk = value
+				elif key == "contact:instagram":
+					c.instagram = value
+				elif key == "contact:twitter":
+					c.twitter = value
+				elif key == "contact:youtube":
+					c.youtube = value
+				elif key == "contact:ok":
+					c.ok = value
+				elif key == "contact:webcam":
+					c.webcam = value
+				elif key == "contact:telegram":
+					c.telegram = value
+				elif key == "contact:whatsapp":
+					c.whatsapp = value
+				elif key == "contact:linkedin":
+					c.linkedin = value
+				elif key == "contact:pinterest":
+					c.pinterest = value
+				elif key == "contact:viper":
+					c.viper = value
+				elif key == "contact:foursquare":
+					c.foursquare = value
+				elif key == "contact:skype":
+					c.skype = value
+				elif key == "contact:xing":
+					c.xing = value
+				elif key == "contact:vhf":
+					c.vhf = value
+				elif key == "contact:flickr":
+					c.flickr = value
+				elif key == "contact:mastodon":
+					c.mastodon = value
+				elif key == "contact:sip":
+					c.sip = value
+				elif key == "contact:diaspora":
+					c.diaspora = value
+				elif key == "contact:gnusocial":
+					c.gnusocial = value
+		return c
+
+	def createAddress(self, lines):
+		a = Address()
+
+		for line in lines:
+			if '<tag ' in line:
+				key = str(line.split('k="')[1].split('"')[0])
+				value = str(line.split('v="')[1].split('"')[0]) 
+
+				if key == "addr:housenumber":
+					a.housenumber = value
+				elif key == "addr:street":
+					a.street = value
+				elif key == "addr:place":
+					a.place = value
+				elif key == "addr:city":
+					a.city = value
+				elif key == "addr:postcode":
+					a.postcode = value
+				elif key == "addr:country":
+					a.country = value
+				elif key == "addr:suburb":
+					a.suburb = value
+				elif key == "addr:state":
+					a.state = value
+				elif key == "addr:province":
+					a.province = value
+		return a
+
+	def createPlace(self, lines, isShop):
+		# TODO Make sure shops are not duplicates.
+		# TODO e.g. REWE(shop) is big enough to have some "Ways" of it's own and multiple nodes, which can cause duplicates.
+
+		nodeIds = []
+		type = ""
+		name = ""
+		openingHours = ""
+
+		address = self.createAddress(lines)
+		contact = self.createContact(lines)
+
+		for line in lines:
+			if '<tag ' in line:
+				key = str(line.split('k="')[1].split('"')[0])
+				value = str(line.split('v="')[1].split('"')[0]) 
+
+				if key == "amenity" and not isShop:
+					type = value
+				elif key == "shop" and isShop:
 					type = value
 				elif key == "name":
 					name = value
+				elif key == "opening_hours":
+					openingHours = value
+
 			elif '<nd ' in line:
 				nodeIds.append(line.split('ref="')[1].split('"')[0])
-		
-		s = Shop(nodeIds, name, type)
-		self.shopList.append(s)
+			elif "<node" in line:
+				nodeIds.append(str(line.split('id="')[1].split('"')[0]))
 
+		p = Place(nodeIds, type, name, address, contact, openingHours)
+		self.placeList.append(p)
 
 	def createWay(self, lines):
 		wayId = ""
@@ -91,7 +193,9 @@ class OSM:
 				self.wayTagList.append(wt)
 
 				if key == "shop":
-					self.createShop(lines)
+					self.createPlace(lines, True)
+				elif key == "amenity":
+					self.createPlace(lines, False)
 
 	def createNode(self, lines):
 		nodeId = ""
@@ -117,4 +221,6 @@ class OSM:
 				self.nodeTagList.append(nt)
 
 				if key == "shop":
-					self.createShop(lines)
\ No newline at end of file
+					self.createPlace(lines, True)
+				elif key == "amenity":
+					self.createPlace(lines, False)
\ No newline at end of file