From 71272e36a608fb315784d9b666d2f98b408e0b7b Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Thu, 31 Oct 2024 17:27:31 +0000
Subject: [PATCH] idk man

---
 parks/__pycache__/models.cpython-312.pyc | Bin 7729 -> 7202 bytes
 parks/__pycache__/urls.cpython-312.pyc   | Bin 1341 -> 1245 bytes
 parks/__pycache__/views.cpython-312.pyc  | Bin 12646 -> 11951 bytes
 parks/models.py                          |  30 +++----
 parks/urls.py                            |   1 -
 parks/views.py                           |  53 +++++--------
 static/css/tailwind.css                  |   4 +
 templates/parks/park_detail.html         |  11 +--
 templates/parks/park_list.html           |  96 +++++++++++++++++++----
 templates/parks/partials/park_list.html  |   2 +-
 10 files changed, 119 insertions(+), 78 deletions(-)

diff --git a/parks/__pycache__/models.cpython-312.pyc b/parks/__pycache__/models.cpython-312.pyc
index 98aaed343acc4e280d2adac8ec0fe3205ba2a335..a2e154aa03d5dec77033665f41369c60d4bf9e5a 100644
GIT binary patch
delta 1128
zcmZvbOH30{6o%(cr!U*mQc7n^A67*LqZH+#NQKraQZ+&Z@lmyu(iEhE-YJka)5x+V
z8Z<XiG%*@uj4n)USeR&xajixg7noVGaBEVZ3**9jripREB=gNb=W*xEx#t%B5B5~O
zHJR2i^eVjCl-y=5RyF9*9Wp5la1wJtO9FLuE{Tb95CK=(P<hgLmBd^VNJ+3)X=P4K
zO((IM`mm22wm8ZDb^L)R9PXqRnTz41C~GEWm8U)$ji+Lw7>$ass@LnC!|jl`pCYU8
zkKu_XF*cJ3&{uIE>2|nl${NPuUJ+VKLd!>?EzeyweO@}}C?N9AxEXbkZ^n%E2#tQC
zl2!4Ph`Xr9{Um4dp)h%BdSigPRP_GtLgYT*#O4qg*4bGcB-LiS2DeFQRI!j3yp!0>
zHu93MHQeR0CWgr&2@Q~_j@Mw<e_?jZUG|@wX=Jk<<h^<Q@Lq3ysPDwF!Q-d5d+U!M
zJQVIbMnxz*csk2&_cn5}Ha;~ynZ_CHqvgmNoJfvOP0Cz+Je_G|m2Tkx^@uEm*IVgJ
zH`Q6E(ihTav0pg>0a=PUX0?XD<-g%ysi`m3)aP}p2J=GaeCJ~8y^cE_pNzJ}jf;c#
zBDW(e?j0rfj%8QV<B?~!=Z>P|xu@t^ZVoI9!ICkU?=9;Xi;y>$wM><DAu=CXD|K1$
zm5jc8?<!~J^JenLa!8}}IY7eIp4v0C9IOLG0D8b#B2|Cc+7EI!zz={;mJP}PTuh|L
zrbh7)n7he!Yc1+odSv~AJX-aZvX#+Pe`WRR5c;m7vaHBocD-6yD%w&k-E|KiP)juT
z5{dISQI7oPeJD+~39kc6U6omcwSxfoE)G$wHFPFuZV)G8%HYi|?R9)W#$FoSgTs(_
znAAEq2}eN=!V)k`bZ#r#Ger8Gjw?_JJ_$HQ(dfa=pmzdx0U!mR2f)tbC_t%m1XLU_
z41nV$YeT_-Q1HM(oC8x5Fa{V0TmoDMU;vyUEcO63fHnG!r@^80c?Q%hg@`Bul|RUU
z5im@eT;EWJY;ZqZuNYgw(*}SOD(n0gr$(n!i7s3qpWT}qP9h}a+ZX%={|^TA56o^s
QA(Wq4kP6aI2DFm>7qXKQkN^Mx

delta 1709
zcmcJPPiz}S6vk(~_QsCac9Yaj6Q}9c(8#M;2}x+7ic9S}NeQ8$A*v86XtiB$jUC5M
zXPtnpr4APqM}-uP_;+ekRSFfSDu*7SH$)E*B`DFJI3RA7Qd$r~9GJJpZGzJyBl)-A
z&YSmU#`DeIc=2}Bd(Y!(M6A7WFO<5|a@!kr+P=s1QsDK@6ndXCP=<%-?naIn9PMlL
z@82s*73aYYj98{s_o<on(I=V0?ksrQF=u@gGRtgEjs%i8<Ezg$xUX@w*Fdtf7B95a
zRK;$fkHQEUIE@V3P5d#&sE8!n_+Pe&D7j6$o}En*2OCa$8BDvHE)-2(nVHdYNs}j9
zDqYU!%my_-n=6o_Y0u=-In$ZVt4blw0uFt4MkB0@GN(xnGHBIMNJ=;PsdufXw>DOu
zQAj~IU9zlZ6<wEQ9i|mon<vL$0jC*CuCof6>Va}G_Nw1Ni1xPz%iBC^?^y6|xqVB=
z7msfV?VG~kHR15}XIG?UX{BemXG7?N;Narm&S3X)_hzVnE!4ju3_v)#7~L6;EJrp&
z18bpy4dM9*JQCWsI>c+EUyfeSt#=$<7`k%i7pJGvP!X=Ke(GAm_#{2yE;gTK>$=66
zoSN0iNv6p;`klKMPtrf#cUw5t0l$ai>{vcW%xak4bp=}4DdP+Tb~pO1>i|`q!C}i+
zdpmNkJaA$CXmCrl(qkt)neHhofJ*hFp^_b=B&HLM`}Y~RX0l0Uol=7S>N!*v)%^5@
zbS|AsiQt)t2wutOBBGK@vY2HT@)Db0;z^7>NE`qrBc}ifzz~CEvus0NVOqB_h@#~O
zGmz2>^2I!vRtg0zDc5{d3W7yw(%V{=A>|UoJo>pU_`lj?%h$40tQ5cKT=#{4bcV@M
zHY??Pr+CW(!*tBo>9@87e`a-uE>JOg*?0fMIgl>^q5yEZ>9(%Hv{ra0pCsp@8@6M5
z{=FZnmd(oYElkE%zuI>nOHGch?JmSOJ+QeP3H*>_a@&%B1Y8cuS`Trv0_rDC{?+y7
zS8dF$qCe&+v%V75{GZ`@`nSIqU#5}3Hxt&XA76Vi0@K5)BzyHRUWSfQz!-yWXZX)W
z^}s2_iKbYW^@G*!)*rBNhK(B`<B<0n<=dV)Fah#S1|7`LN>s1<c^YqPD}M;Vw*YT5
zNS)+4(0zb@0HhEFVA<vZC~M&wsEYs<0NXYj67k7Id}x@=Lstec1;_$)KmjldfbEbu
zYtuZ)J&uRG2LbC?il9miI(%wl)g2hn3CPex?Z07zHV1Dq-U%MWSLjc{BVh$&Y2nyX
bv=V)UKtCGcx^Mz7%q<xe<97twI<$WP>XLQV

diff --git a/parks/__pycache__/urls.cpython-312.pyc b/parks/__pycache__/urls.cpython-312.pyc
index b2afbce091c55db094ac96d2478082edb6dc5105..016ae9e834ce0050fd2c3c88faf0faab20b982be 100644
GIT binary patch
delta 140
zcmdnXb(d59G%qg~0}vGMQcgd{#K7<v#DM`mDC6^~jq3G`lg}~APF~I^sKmsO%9J9O
zBECjqHBbi#!02?2DE>-GO{vLpOcy5eF^4h=Oip1go_vQnk4qk?j1h>7&rJ?tSumNM
RRhwIolb@-PyGRx&3IOPb97q5F

delta 199
zcmcc1xtB}*G%qg~0}%W>r<Bge%)sy%#DM{RDC6^|jq3G`lMgWpv81wO$xU3QZ!ETk
zV>M7Y2rx0EGNy<FNv0Hu6v;JGtC=9;Fgl$xN}y6&Q)cov#tU-%iCKvi`Z@W@i6xo&
zdBys-c+*o$;$i&BN0`DH1t-fe7c&(JPVQkY<Wc~d#R$a34=1y;ESOxtA~Jaeix#&q
N7e7-Ycaa=W1^`U*E~o$i

diff --git a/parks/__pycache__/views.cpython-312.pyc b/parks/__pycache__/views.cpython-312.pyc
index 330dd84808f2f2985de519764319348788f3e5e5..af4d4b648b2174460129a5904c7f97ca34cad290 100644
GIT binary patch
delta 2042
zcmZuyZ)_7~7{B-0UPrg~pzU_;+S0BY{j-*BA_D^=h7BAMCJQ4*0lRL!ZH$h>dmU`p
zxv3~y{4>g<86*;xNX*D4%+wgs1o`9_BcWMLoBGKwMiW1vU@-BE?{hbBkX>@Wd*9#h
zd7pdl`Saed-PaFWelVL&9J^X?)b{=4&RQHKkqtf=<GB~Og#8ScsFW?TZcdLT9QSHe
z<*OJk$sXA&`{WwgFO#{lC4IfBJDBcVQEyQ7YNoqneonWvs&T{}_WX{Mu&!ikmDBOu
zr{wmk+ySvmFTBWTx(B|sxyfEA+NQ_>=(o3$=G^CYJ@46%YMjAULJzWsLKyhy2BbUT
zc2zCufWNB7eXpqmgR30fh-1~F1xE-?a9)a#mfTG#L7wYIww^)Bq9lj<VnZ|;J9;Wk
z`)D7M<$ZEG);$tKEv!@DS}Hp+B-0T^PSZGaIX9D6au=L~gbae<sv!dqay9sIr_7<8
zlzY-KDktM<IYF(AysB4y&~6xZ1;_|ocGU@8j8~4sOw@7SzX5FSedWl|0fZhn=I$W<
zaLer&OCTX5^dhW5z)jL43`(}1)UmWYoQ|cs2k@=O;)60(P#!@TM;mi2){~4YN{^gO
z#$qgrql{If_`DXQB$^_0qTpxn&l#>*v3h)G(GD+r){-RLl$^OK&u@fG!m!udlEM{_
zf~f811agB2n5<GoYf4tyQ|X<<N0f9}&;meFeh*<1O5OlbfcX3Zu2kNDOU~+Ci?5#S
zoj`*jgp&vulCY5u<5>MFJB}g<Q3SO>PUGlx1_~Ck&*vN0zHJ1)sR;=g6xy|5ANGx*
ztrlqHm(|lao1c!rcQq2sx$VN+X!s^v^Ivdln`U!X59$jaeJRUUckO=iE__wHW$Z1q
zFw-ZJhBfei(x~e8IC76?ik?UA48l7MmZ#_}k_bmpz|U4wWXBXm$M+VieRuRyu@X{s
z9&#451)tTuY3$W;+%%U4V)ekx+DhnJH_eaokX^T(@Q_~@;74`pM5j&k>O`+i3_t?C
z!l;npX$Ztn6<i9IJNbFj9EOWsX`A-sxC}pE4ue4_SV9h+ZoUFYC}=i6v>PQE1DHcj
z(J*gW#tF#n5az{Y9NEu>SGUtP=9q3m*oLs1K}k5?pGv0`wIE7@BFAY@KlL#MXy}yn
zA{&HFT5qUzaT@*&ZQ5*HR&*Db$rDZ~E>nyQSh?V(RZI#Fh1UvM)DFXVxFa+n6s=X$
z(QLF}_2;erf;Eu024+SU{EOD+f^}=&x^>aIZNgZD>tR0{i?*rEWTqf`^P;yP*5<|9
znO(Cx7RAPb*qj%e7sbsJdes=}>uYx2)9D<RiMBsYT!pPDd8fy+W4Daw#ulZviMC(L
z*DO(ApG0aGQsP6Z6R91l6?|VGY{V0~oZa`XuoQhvSmKvb#c`9m4EF(RjKr!VT!vgB
z9}-pu3z6+`Fmf4sBio4q4n=l%3JHFWXCBy<Fn(gl@QJc#**L?q#F*Nt8bco=RtjX;
zpy`h%j$VYuXr)<gVZ%}jLr2tRU$Iq(qkiEU^RLXYR(;wjxu!GOOhF3frC>pd<fX{$
z?ghFiZGk_c)zwA2V|q_^Pr+W7x7QWyp}ajbTeV<av~Ogx%Tg``OcTaCt84OQ{<{{a
zTz@%;C#JTCdNyJk#@`8TWKhzxvtQ9pv{CqZeVE(;L&MgNC;IsD!&mEL^(a)2C3L!S
z_kM&5!uybI@OWJY$Nep<4AO%tgQ58@$3XjGp+$SRDfeT;EUCnQmU<|wZLhAT12EO(
iFn!4s%&amCUo`FG@4KPwsh7kJr1{)4e{<}iI{ObCN$>Ii

delta 2576
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

diff --git a/parks/models.py b/parks/models.py
index 75915989..7f767ddd 100644
--- a/parks/models.py
+++ b/parks/models.py
@@ -66,17 +66,7 @@ class Park(models.Model):
             self.slug = slugify(self.name)
         
         # Update the location field to combine country, region, and city
-        location_parts = []
-        if self.city:
-            location_parts.append(self.city.name)
-        if self.region:
-            location_parts.append(self.region.name)
-        if self.country:
-            location_parts.append(self.country.name)
-        
-        # Only update location if we have parts to combine
-        if location_parts:
-            self.location = ', '.join(location_parts)
+        self.location = self.get_formatted_location()
         
         super().save(*args, **kwargs)
 
@@ -93,15 +83,15 @@ class Park(models.Model):
             raise cls.DoesNotExist("No park found with this slug")
 
     def get_formatted_location(self):
-        """Get a formatted location string combining city, region, and country"""
-        location_parts = []
-        if self.city:
-            location_parts.append(self.city.name)
-        if self.region:
-            location_parts.append(self.region.name)
-        if self.country:
-            location_parts.append(self.country.name)
-        return ', '.join(location_parts)
+        """Get a formatted location string: $COUNTRY, $REGION, $CITY"""
+        location = self.country.name
+        
+        if self.region and self.city:
+            location += f", {self.region.name}, {self.city.name}"
+        elif self.region:
+            location += f", {self.region.name}"
+        
+        return location
 
 class ParkArea(models.Model):
     name = models.CharField(max_length=255)
diff --git a/parks/urls.py b/parks/urls.py
index 748c128f..d2db9d9f 100644
--- a/parks/urls.py
+++ b/parks/urls.py
@@ -11,7 +11,6 @@ urlpatterns = [
     path('ajax/countries/', views.get_countries, name='get_countries'),
     path('ajax/regions/', views.get_regions, name='get_regions'),
     path('ajax/cities/', views.get_cities, name='get_cities'),
-    path('ajax/locations/', views.get_locations, name='get_locations'),
     path('<slug:slug>/', views.ParkDetailView.as_view(), name='park_detail'),
     path('<slug:park_slug>/rides/', include('rides.urls', namespace='rides')),
 ]
diff --git a/parks/views.py b/parks/views.py
index d7bf5553..c6d19611 100644
--- a/parks/views.py
+++ b/parks/views.py
@@ -45,24 +45,6 @@ def get_cities(request):
     ).values_list('name', flat=True)[:10]
     return JsonResponse(list(cities), safe=False)
 
-def get_locations(request):
-    query = request.GET.get('q', '')
-    locations = set()
-    
-    # Search countries
-    countries = Country.objects.filter(name__icontains=query).values_list('name', flat=True)[:5]
-    locations.update(countries)
-    
-    # Search regions
-    regions = Region.objects.filter(name__icontains=query).values_list('name', flat=True)[:5]
-    locations.update(regions)
-    
-    # Search cities
-    cities = City.objects.filter(name__icontains=query).values_list('name', flat=True)[:5]
-    locations.update(cities)
-    
-    return JsonResponse(list(locations), safe=False)
-
 class ParkCreateView(LoginRequiredMixin, CreateView):
     model = Park
     form_class = ParkForm
@@ -163,26 +145,27 @@ class ParkListView(ListView):
     def get_queryset(self):
         queryset = Park.objects.select_related('owner', 'country', 'region', 'city').prefetch_related('photos', 'rides')
         
-        search = self.request.GET.get('search', '').strip() or None
-        location = self.request.GET.get('location', '').strip() or None
-        status = self.request.GET.get('status', '').strip() or None
+        search = self.request.GET.get('search', '').strip()
+        country = self.request.GET.get('country', '').strip()
+        region = self.request.GET.get('region', '').strip()
+        city = self.request.GET.get('city', '').strip()
+        status = self.request.GET.get('status', '').strip()
         
         if search:
             queryset = queryset.filter(
                 Q(name__icontains=search) | 
-                Q(location__icontains=search) |
-                Q(country__name__icontains=search) |
-                Q(region__name__icontains=search) |
-                Q(city__name__icontains=search)
-            )
-        if location:
-            # Try to match against the formatted location or any location field
-            queryset = queryset.filter(
-                Q(location__icontains=location) |
-                Q(country__name__icontains=location) |
-                Q(region__name__icontains=location) |
-                Q(city__name__icontains=location)
+                Q(location__icontains=search)
             )
+        
+        if country:
+            queryset = queryset.filter(country__name__icontains=country)
+        
+        if region:
+            queryset = queryset.filter(region__name__icontains=region)
+        
+        if city:
+            queryset = queryset.filter(city__name__icontains=city)
+        
         if status:
             queryset = queryset.filter(status=status)
             
@@ -192,7 +175,9 @@ class ParkListView(ListView):
         context = super().get_context_data(**kwargs)
         context['current_filters'] = {
             'search': self.request.GET.get('search', ''),
-            'location': self.request.GET.get('location', ''),
+            'country': self.request.GET.get('country', ''),
+            'region': self.request.GET.get('region', ''),
+            'city': self.request.GET.get('city', ''),
             'status': self.request.GET.get('status', '')
         }
         return context
diff --git a/static/css/tailwind.css b/static/css/tailwind.css
index 8eb604be..9b56c102 100644
--- a/static/css/tailwind.css
+++ b/static/css/tailwind.css
@@ -3491,6 +3491,10 @@ select {
     grid-template-columns: repeat(4, minmax(0, 1fr));
   }
 
+  .lg\:grid-cols-5 {
+    grid-template-columns: repeat(5, minmax(0, 1fr));
+  }
+
   .lg\:text-6xl {
     font-size: 3.75rem;
     line-height: 1;
diff --git a/templates/parks/park_detail.html b/templates/parks/park_detail.html
index 83fc8984..45be2302 100644
--- a/templates/parks/park_detail.html
+++ b/templates/parks/park_detail.html
@@ -18,8 +18,7 @@
                     data-field-name="name">{{ park.name }}</h1>
                 <p class="text-gray-600 dark:text-gray-300">
                     <i class="mr-2 fas fa-map-marker-alt"></i>
-                    <span data-editable data-content-id="{{ park.id }}" 
-                          data-field-name="location">{{ park.location }}</span>
+                    <span>{{ park.get_formatted_location }}</span>
                 </p>
             </div>
             <div class="flex gap-2 mt-4 md:mt-0">
@@ -201,12 +200,10 @@
                     <div class="p-4 transition-transform transform rounded-lg bg-gray-50 dark:bg-gray-700/50 hover:-translate-y-1">
                         <dt class="flex items-center mb-1 text-gray-600 dark:text-gray-300">
                             <i class="w-5 text-blue-500 fas fa-globe dark:text-blue-400"></i>
-                            <span class="ml-2">Country</span>
+                            <span class="ml-2">Location</span>
                         </dt>
-                        <dd class="font-medium text-gray-900 dark:text-white"
-                            data-editable data-content-id="{{ park.id }}" 
-                            data-field-name="country">
-                            {{ park.get_country_name }}
+                        <dd class="font-medium text-gray-900 dark:text-white">
+                            {{ park.get_formatted_location }}
                         </dd>
                     </div>
                     {% if park.opening_date %}
diff --git a/templates/parks/park_list.html b/templates/parks/park_list.html
index 50f5c05d..7d6ca276 100644
--- a/templates/parks/park_list.html
+++ b/templates/parks/park_list.html
@@ -16,9 +16,9 @@
 
     <!-- Filters -->
     <div class="p-4 mb-6 bg-white rounded-lg shadow dark:bg-gray-800">
-        <form class="grid grid-cols-1 gap-4 md:grid-cols-3" 
+        <form id="park-filters" class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-5" 
               hx-get="{% url 'parks:park_list' %}"
-              hx-trigger="change from:select, input[type='text'] delay:500ms"
+              hx-trigger="change from:select, input from:input[type='text'] delay:500ms"
               hx-target="#parks-grid"
               hx-push-url="true">
             <div>
@@ -29,11 +29,25 @@
                        placeholder="Search parks...">
             </div>
             <div>
-                <label for="location" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">Location</label>
-                <input type="text" name="location" id="location" 
-                       value="{{ current_filters.location }}"
+                <label for="country" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">Country</label>
+                <input type="text" name="country" id="country" 
+                       value="{{ current_filters.country }}"
                        class="w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                       placeholder="Search locations...">
+                       placeholder="Select country...">
+            </div>
+            <div>
+                <label for="region" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">State/Region</label>
+                <input type="text" name="region" id="region" 
+                       value="{{ current_filters.region }}"
+                       class="w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+                       placeholder="Select state/region...">
+            </div>
+            <div>
+                <label for="city" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">City</label>
+                <input type="text" name="city" id="city" 
+                       value="{{ current_filters.city }}"
+                       class="w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+                       placeholder="Select city...">
             </div>
             <div>
                 <label for="status" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">Status</label>
@@ -84,27 +98,79 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/awesomplete/1.1.5/awesomplete.min.js"></script>
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-    var locationInput = document.getElementById('location');
-    if (locationInput) {
-        var locationList = new Awesomplete(locationInput, {
+    const countryInput = document.getElementById('country');
+    const regionInput = document.getElementById('region');
+    const cityInput = document.getElementById('city');
+
+    // Initialize Awesomplete for country
+    if (countryInput) {
+        const countryList = new Awesomplete(countryInput, {
             minChars: 1,
             maxItems: 10,
             autoFirst: true
         });
 
-        locationInput.addEventListener('input', function() {
-            fetch(`/parks/ajax/locations/?q=${encodeURIComponent(this.value)}`)
+        countryInput.addEventListener('input', function() {
+            fetch(`/parks/ajax/countries/?q=${encodeURIComponent(this.value)}`)
                 .then(response => response.json())
                 .then(data => {
-                    locationList.list = data;
+                    countryList.list = data;
                 });
         });
+    }
 
-        // Trigger HTMX request when a location is selected
-        locationInput.addEventListener('awesomplete-select', function(event) {
-            htmx.trigger(this, 'change');
+    // Initialize Awesomplete for region
+    if (regionInput) {
+        const regionList = new Awesomplete(regionInput, {
+            minChars: 1,
+            maxItems: 10,
+            autoFirst: true
+        });
+
+        regionInput.addEventListener('input', function() {
+            const country = countryInput.value;
+            fetch(`/parks/ajax/regions/?q=${encodeURIComponent(this.value)}&country=${encodeURIComponent(country)}`)
+                .then(response => response.json())
+                .then(data => {
+                    regionList.list = data;
+                });
         });
     }
+
+    // Initialize Awesomplete for city
+    if (cityInput) {
+        const cityList = new Awesomplete(cityInput, {
+            minChars: 1,
+            maxItems: 10,
+            autoFirst: true
+        });
+
+        cityInput.addEventListener('input', function() {
+            const country = countryInput.value;
+            const region = regionInput.value;
+            fetch(`/parks/ajax/cities/?q=${encodeURIComponent(this.value)}&country=${encodeURIComponent(country)}&region=${encodeURIComponent(region)}`)
+                .then(response => response.json())
+                .then(data => {
+                    cityList.list = data;
+                });
+        });
+    }
+
+    // Handle location link clicks
+    document.querySelectorAll('.location-link').forEach(link => {
+        link.addEventListener('click', function(e) {
+            e.preventDefault();
+            const params = new URLSearchParams(this.getAttribute('href').split('?')[1]);
+            
+            // Update form inputs
+            countryInput.value = params.get('country') || '';
+            regionInput.value = params.get('region') || '';
+            cityInput.value = params.get('city') || '';
+            
+            // Trigger form submission
+            htmx.trigger('#park-filters', 'change');
+        });
+    });
 });
 </script>
 {% endblock %}
diff --git a/templates/parks/partials/park_list.html b/templates/parks/partials/park_list.html
index 9962749f..d6f8e286 100644
--- a/templates/parks/partials/park_list.html
+++ b/templates/parks/partials/park_list.html
@@ -18,7 +18,7 @@
                 </h2>
                 <p class="mb-3 text-gray-600 dark:text-gray-400">
                     <i class="mr-1 fas fa-map-marker-alt"></i>
-                    {{ park.location }}
+                    {{ park.get_formatted_location }}
                 </p>
                 <div class="flex flex-wrap gap-2">
                     <span class="status-badge {% if park.status == 'OPERATING' %}status-operating