From 491be57ab2c19fb72a2e7efb0b7a9833038ace01 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 5 Nov 2024 04:10:47 +0000
Subject: [PATCH] initial geodjango implementation

---
 location/migrations/0004_add_point_field.py   |  27 +++
 .../0005_convert_coordinates_to_points.py     |  52 ++++++
 .../0006_readd_historical_records.py          | 174 ++++++++++++++++++
 location/models.py                            |  51 ++++-
 media/__pycache__/models.cpython-312.pyc      | Bin 5100 -> 5169 bytes
 media/migrations/0006_photo_is_approved.py    |  18 ++
 media/models.py                               |   1 +
 media/views.py                                |   6 +-
 parks/__pycache__/models.cpython-312.pyc      | Bin 10438 -> 7907 bytes
 parks/__pycache__/views.cpython-312.pyc       | Bin 21684 -> 24235 bytes
 parks/forms.py                                | 124 ++++++++++---
 ..._alter_historicalpark_latitude_and_more.py |   5 -
 .../0008_historicalpark_historicalparkarea.py |   3 -
 .../0009_migrate_to_location_model.py         |  83 +++++++++
 .../0010_remove_legacy_location_fields.py     |  69 +++++++
 parks/models.py                               | 103 ++---------
 parks/views.py                                |  65 +++++--
 static/css/tailwind.css                       |  67 +++++--
 templates/parks/park_detail.html              |  67 +++----
 templates/rides/ride_detail.html              |  78 ++++----
 .../__pycache__/settings.cpython-312.pyc      | Bin 5767 -> 5806 bytes
 thrillwiki/settings.py                        |   4 +-
 22 files changed, 768 insertions(+), 229 deletions(-)
 create mode 100644 location/migrations/0004_add_point_field.py
 create mode 100644 location/migrations/0005_convert_coordinates_to_points.py
 create mode 100644 location/migrations/0006_readd_historical_records.py
 create mode 100644 media/migrations/0006_photo_is_approved.py
 create mode 100644 parks/migrations/0009_migrate_to_location_model.py
 create mode 100644 parks/migrations/0010_remove_legacy_location_fields.py

diff --git a/location/migrations/0004_add_point_field.py b/location/migrations/0004_add_point_field.py
new file mode 100644
index 00000000..1d98f195
--- /dev/null
+++ b/location/migrations/0004_add_point_field.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.1.2 on 2024-11-04 22:30
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("location", "0003_alter_historicallocation_city_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="location",
+            name="point",
+            field=django.contrib.gis.db.models.fields.PointField(
+                blank=True,
+                help_text="Geographic coordinates as a Point",
+                null=True,
+                srid=4326,
+            ),
+        ),
+        migrations.DeleteModel(
+            name="HistoricalLocation",
+        ),
+    ]
diff --git a/location/migrations/0005_convert_coordinates_to_points.py b/location/migrations/0005_convert_coordinates_to_points.py
new file mode 100644
index 00000000..0648cb35
--- /dev/null
+++ b/location/migrations/0005_convert_coordinates_to_points.py
@@ -0,0 +1,52 @@
+# Generated by Django 5.1.2 on 2024-11-04 22:21
+
+from django.db import migrations, transaction
+from django.contrib.gis.geos import Point
+
+def forwards_func(apps, schema_editor):
+    """Convert existing lat/lon coordinates to points"""
+    Location = apps.get_model("location", "Location")
+    db_alias = schema_editor.connection.alias
+    
+    # Update all locations with points based on existing lat/lon
+    with transaction.atomic():
+        for location in Location.objects.using(db_alias).all():
+            if location.latitude is not None and location.longitude is not None:
+                try:
+                    location.point = Point(
+                        float(location.longitude),  # x coordinate (longitude)
+                        float(location.latitude),   # y coordinate (latitude)
+                        srid=4326  # WGS84 coordinate system
+                    )
+                    location.save(update_fields=['point'])
+                except (ValueError, TypeError):
+                    print(f"Warning: Could not convert coordinates for location {location.id}")
+                    continue
+
+def reverse_func(apps, schema_editor):
+    """Convert points back to lat/lon coordinates"""
+    Location = apps.get_model("location", "Location")
+    db_alias = schema_editor.connection.alias
+    
+    # Update all locations with lat/lon based on points
+    with transaction.atomic():
+        for location in Location.objects.using(db_alias).all():
+            if location.point:
+                try:
+                    location.latitude = location.point.y
+                    location.longitude = location.point.x
+                    location.point = None
+                    location.save(update_fields=['latitude', 'longitude', 'point'])
+                except (ValueError, TypeError, AttributeError):
+                    print(f"Warning: Could not convert point back to coordinates for location {location.id}")
+                    continue
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0004_add_point_field'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, atomic=True),
+    ]
diff --git a/location/migrations/0006_readd_historical_records.py b/location/migrations/0006_readd_historical_records.py
new file mode 100644
index 00000000..3bc51178
--- /dev/null
+++ b/location/migrations/0006_readd_historical_records.py
@@ -0,0 +1,174 @@
+# Generated by Django 5.1.2 on 2024-11-04 22:32
+
+import django.contrib.gis.db.models.fields
+import django.core.validators
+import django.db.models.deletion
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("location", "0005_convert_coordinates_to_points"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="HistoricalLocation",
+            fields=[
+                (
+                    "id",
+                    models.BigIntegerField(
+                        auto_created=True, blank=True, db_index=True, verbose_name="ID"
+                    ),
+                ),
+                ("object_id", models.PositiveIntegerField()),
+                (
+                    "name",
+                    models.CharField(
+                        help_text="Name of the location (e.g. business name, landmark)",
+                        max_length=255,
+                    ),
+                ),
+                (
+                    "location_type",
+                    models.CharField(
+                        help_text="Type of location (e.g. business, landmark, address)",
+                        max_length=50,
+                    ),
+                ),
+                (
+                    "latitude",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=6,
+                        help_text="Latitude coordinate (legacy field)",
+                        max_digits=9,
+                        null=True,
+                        validators=[
+                            django.core.validators.MinValueValidator(-90),
+                            django.core.validators.MaxValueValidator(90),
+                        ],
+                    ),
+                ),
+                (
+                    "longitude",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=6,
+                        help_text="Longitude coordinate (legacy field)",
+                        max_digits=9,
+                        null=True,
+                        validators=[
+                            django.core.validators.MinValueValidator(-180),
+                            django.core.validators.MaxValueValidator(180),
+                        ],
+                    ),
+                ),
+                (
+                    "point",
+                    django.contrib.gis.db.models.fields.PointField(
+                        blank=True,
+                        help_text="Geographic coordinates as a Point",
+                        null=True,
+                        srid=4326,
+                    ),
+                ),
+                (
+                    "street_address",
+                    models.CharField(blank=True, max_length=255, null=True),
+                ),
+                ("city", models.CharField(blank=True, max_length=100, null=True)),
+                (
+                    "state",
+                    models.CharField(
+                        blank=True,
+                        help_text="State/Region/Province",
+                        max_length=100,
+                        null=True,
+                    ),
+                ),
+                ("country", models.CharField(blank=True, max_length=100, null=True)),
+                ("postal_code", models.CharField(blank=True, max_length=20, null=True)),
+                ("created_at", models.DateTimeField(blank=True, editable=False)),
+                ("updated_at", models.DateTimeField(blank=True, editable=False)),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical location",
+                "verbose_name_plural": "historical locations",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.RemoveIndex(
+            model_name="location",
+            name="location_lo_latitud_7045c4_idx",
+        ),
+        migrations.AlterField(
+            model_name="location",
+            name="latitude",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=6,
+                help_text="Latitude coordinate (legacy field)",
+                max_digits=9,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(-90),
+                    django.core.validators.MaxValueValidator(90),
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="location",
+            name="longitude",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=6,
+                help_text="Longitude coordinate (legacy field)",
+                max_digits=9,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(-180),
+                    django.core.validators.MaxValueValidator(180),
+                ],
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicallocation",
+            name="content_type",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="contenttypes.contenttype",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicallocation",
+            name="history_user",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="+",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/location/models.py b/location/models.py
index 84f2136a..b758aa78 100644
--- a/location/models.py
+++ b/location/models.py
@@ -1,8 +1,10 @@
+from django.contrib.gis.db import models as gis_models
 from django.db import models
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MinValueValidator, MaxValueValidator
 from simple_history.models import HistoricalRecords
+from django.contrib.gis.geos import Point
 
 class Location(models.Model):
     """
@@ -27,7 +29,7 @@ class Location(models.Model):
             MinValueValidator(-90),
             MaxValueValidator(90)
         ],
-        help_text="Latitude coordinate",
+        help_text="Latitude coordinate (legacy field)",
         null=True,
         blank=True
     )
@@ -38,12 +40,20 @@ class Location(models.Model):
             MinValueValidator(-180),
             MaxValueValidator(180)
         ],
-        help_text="Longitude coordinate",
+        help_text="Longitude coordinate (legacy field)",
         null=True,
         blank=True
     )
     
-    # Address components - all made nullable
+    # GeoDjango point field
+    point = gis_models.PointField(
+        srid=4326,  # WGS84 coordinate system
+        null=True,
+        blank=True,
+        help_text="Geographic coordinates as a Point"
+    )
+    
+    # Address components
     street_address = models.CharField(max_length=255, blank=True, null=True)
     city = models.CharField(max_length=100, blank=True, null=True)
     state = models.CharField(max_length=100, blank=True, null=True, help_text="State/Region/Province")
@@ -58,7 +68,6 @@ class Location(models.Model):
     class Meta:
         indexes = [
             models.Index(fields=['content_type', 'object_id']),
-            models.Index(fields=['latitude', 'longitude']),
             models.Index(fields=['city']),
             models.Index(fields=['country']),
         ]
@@ -73,6 +82,15 @@ class Location(models.Model):
         location_str = ", ".join(location_parts) if location_parts else "Unknown location"
         return f"{self.name} ({location_str})"
 
+    def save(self, *args, **kwargs):
+        # Sync point field with lat/lon fields for backward compatibility
+        if self.latitude is not None and self.longitude is not None and not self.point:
+            self.point = Point(float(self.longitude), float(self.latitude))
+        elif self.point and (self.latitude is None or self.longitude is None):
+            self.longitude = self.point.x
+            self.latitude = self.point.y
+        super().save(*args, **kwargs)
+
     def get_formatted_address(self):
         """Returns a formatted address string"""
         components = []
@@ -91,6 +109,29 @@ class Location(models.Model):
     @property
     def coordinates(self):
         """Returns coordinates as a tuple"""
-        if self.latitude is not None and self.longitude is not None:
+        if self.point:
+            return (self.point.y, self.point.x)  # Returns (latitude, longitude)
+        elif self.latitude is not None and self.longitude is not None:
             return (float(self.latitude), float(self.longitude))
         return None
+
+    def distance_to(self, other_location):
+        """
+        Calculate the distance to another location in meters.
+        Returns None if either location is missing coordinates.
+        """
+        if not self.point or not other_location.point:
+            return None
+        return self.point.distance(other_location.point) * 100000  # Convert to meters
+
+    def nearby_locations(self, distance_km=10):
+        """
+        Find locations within specified distance in kilometers.
+        Returns a queryset of nearby Location objects.
+        """
+        if not self.point:
+            return Location.objects.none()
+        
+        return Location.objects.filter(
+            point__distance_lte=(self.point, distance_km * 1000)  # Convert km to meters
+        ).exclude(pk=self.pk)
diff --git a/media/__pycache__/models.cpython-312.pyc b/media/__pycache__/models.cpython-312.pyc
index f9ed7f9a2495c45bd5bbecc764fa7cbc28d86587..22ec7541faf472d198482e8107efd1f8b9a84ce7 100644
GIT binary patch
delta 377
zcmaE(zEOksG%qg~0}$9w*Gx~^$ZN>XXfWBH{Sc$XWJW&W$?w^D*!h?kQdzR(Kzw1A
zH5{uMLCP5zq684)ldU;;j0M4b6^JY{nJS#6fy{@nfo5uf?dav;lNZCOR~)F$VDc^w
zS$0XV8k5QQIHUumfoz!+-W0yoOc2weWSJP;8B+LL7*Yh_Vsa^hsq$$|DMBqQQ3@%-
zsfsBgKrEOdn#R__kj9uI*1{8|)WJ}}7^S?~i}MO2qx)ugZdOJ{-_5E#`pk?0lSBD;
zF{(@!5Xj)+&Mb~kEGQ_-FH23CTrO~vQEPIbV6vc)>IAjxLaG;qR9B>45i)7;-n?0G
k6(eKz<Tzn<#<Iz6!ok7@jA|Wj{XU&OUm1YRB152i0bE*4SO5S3

delta 326
zcmdm}@kX8ZG%qg~0}vbu)=1~s$ZN>X$TiuX{Sc$f<OLielWjP-+4-3mQdzRVe7iNA
zs~JJ685p7jz`{xp9x|CKl%<Buhp>T0XaJ2=lo!RRPYkF=Z}I~US#}Aq8l%atn52TD
zq<|dh6y6lR)l3khqGXsD+!<2%TNqLV;9{~Vf~j(8OesPwEK%|)!l?==B0wydBAUk5
z!H~w7BG$qarP#qx!5F2qxq$NuBct19S8i5DMxV{zJo?Ox{*$ZucQGnYHWSF0yjtJ}
uqr~JE!Q{<91y?dMW=&o!tj<_E`LuAbus)+&hg-i-r_WagAhXC2=pX<ER6zLv

diff --git a/media/migrations/0006_photo_is_approved.py b/media/migrations/0006_photo_is_approved.py
new file mode 100644
index 00000000..b04a82fd
--- /dev/null
+++ b/media/migrations/0006_photo_is_approved.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-11-05 03:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("media", "0005_alter_photo_image"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="photo",
+            name="is_approved",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/media/models.py b/media/models.py
index 129e008e..86f94b3a 100644
--- a/media/models.py
+++ b/media/models.py
@@ -53,6 +53,7 @@ class Photo(models.Model):
     caption = models.CharField(max_length=255, blank=True)
     alt_text = models.CharField(max_length=255, blank=True)
     is_primary = models.BooleanField(default=False)
+    is_approved = models.BooleanField(default=False)  # New field for approval status
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     uploaded_by = models.ForeignKey(
diff --git a/media/views.py b/media/views.py
index 79e3efab..99a7ec9a 100644
--- a/media/views.py
+++ b/media/views.py
@@ -75,16 +75,19 @@ def upload_photo(request):
                 {"error": "You do not have permission to upload photos"}, status=403
             )
 
+        # Determine if the photo should be auto-approved
+        is_approved = request.user.is_superuser or request.user.is_staff or request.user.groups.filter(name='Moderators').exists()
+
         # Create the photo
         photo = Photo.objects.create(
             image=request.FILES["image"],
             content_type=content_type,
             object_id=obj.id,
             uploaded_by=request.user,  # Add the user who uploaded the photo
-            # Set as primary if it's the first photo
             is_primary=not Photo.objects.filter(
                 content_type=content_type, object_id=obj.id
             ).exists(),
+            is_approved=is_approved  # Auto-approve if the user is a moderator, admin, or superuser
         )
 
         return JsonResponse(
@@ -93,6 +96,7 @@ def upload_photo(request):
                 "url": photo.image.url,
                 "caption": photo.caption,
                 "is_primary": photo.is_primary,
+                "is_approved": photo.is_approved,
             }
         )
 
diff --git a/parks/__pycache__/models.cpython-312.pyc b/parks/__pycache__/models.cpython-312.pyc
index be7cd022a8ae23d5dff570f2113b5a0f267fae30..b42662cb81efea638f06819545948d758b7a426e 100644
GIT binary patch
delta 2762
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

literal 10438
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

diff --git a/parks/__pycache__/views.cpython-312.pyc b/parks/__pycache__/views.cpython-312.pyc
index 3013a2dfcadd78529c7d34e2e279e43830e7323c..c24ba5f6816a4ffca3df63727f9de7a0f6530d96 100644
GIT binary patch
delta 7227
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

delta 5579
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
Tx<<$4r3Xd!I}b*!*z^AYxYIB+

diff --git a/parks/forms.py b/parks/forms.py
index 2885988e..869fb3b0 100644
--- a/parks/forms.py
+++ b/parks/forms.py
@@ -5,6 +5,64 @@ from .models import Park
 
 class ParkForm(forms.ModelForm):
     """Form for creating and updating Park objects with location support"""
+    # Location fields
+    latitude = forms.DecimalField(
+        max_digits=9,
+        decimal_places=6,
+        required=False,
+        widget=forms.HiddenInput()
+    )
+    longitude = forms.DecimalField(
+        max_digits=10,
+        decimal_places=6,
+        required=False,
+        widget=forms.HiddenInput()
+    )
+    street_address = forms.CharField(
+        max_length=255,
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+            }
+        )
+    )
+    city = forms.CharField(
+        max_length=255,
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+            }
+        )
+    )
+    state = forms.CharField(
+        max_length=255,
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+            }
+        )
+    )
+    country = forms.CharField(
+        max_length=255,
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+            }
+        )
+    )
+    postal_code = forms.CharField(
+        max_length=20,
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+            }
+        )
+    )
 
     class Meta:
         model = Park
@@ -18,6 +76,7 @@ class ParkForm(forms.ModelForm):
             "operating_season",
             "size_acres",
             "website",
+            # Location fields handled separately
             "latitude",
             "longitude",
             "street_address",
@@ -79,36 +138,21 @@ class ParkForm(forms.ModelForm):
                     "placeholder": "https://example.com",
                 }
             ),
-            # Location fields
-            "latitude": forms.HiddenInput(),
-            "longitude": forms.HiddenInput(),
-            "street_address": forms.TextInput(
-                attrs={
-                    "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                }
-            ),
-            "city": forms.TextInput(
-                attrs={
-                    "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                }
-            ),
-            "state": forms.TextInput(
-                attrs={
-                    "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                }
-            ),
-            "country": forms.TextInput(
-                attrs={
-                    "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                }
-            ),
-            "postal_code": forms.TextInput(
-                attrs={
-                    "class": "w-full border-gray-300 rounded-lg form-input dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                }
-            ),
         }
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Pre-fill location fields if editing existing park
+        if self.instance and self.instance.pk and self.instance.location.exists():
+            location = self.instance.location.first()
+            self.fields['latitude'].initial = location.latitude
+            self.fields['longitude'].initial = location.longitude
+            self.fields['street_address'].initial = location.street_address
+            self.fields['city'].initial = location.city
+            self.fields['state'].initial = location.state
+            self.fields['country'].initial = location.country
+            self.fields['postal_code'].initial = location.postal_code
+
     def clean_latitude(self):
         latitude = self.cleaned_data.get('latitude')
         if latitude is not None:
@@ -146,3 +190,27 @@ class ParkForm(forms.ModelForm):
             except (InvalidOperation, TypeError):
                 raise forms.ValidationError("Invalid longitude value.")
         return longitude
+
+    def save(self, commit=True):
+        park = super().save(commit=False)
+        
+        # Prepare location data
+        location_data = {
+            'name': park.name,
+            'location_type': 'park',
+            'latitude': self.cleaned_data.get('latitude'),
+            'longitude': self.cleaned_data.get('longitude'),
+            'street_address': self.cleaned_data.get('street_address'),
+            'city': self.cleaned_data.get('city'),
+            'state': self.cleaned_data.get('state'),
+            'country': self.cleaned_data.get('country'),
+            'postal_code': self.cleaned_data.get('postal_code'),
+        }
+        
+        # Set location data to be saved with the park
+        park.set_location(**location_data)
+        
+        if commit:
+            park.save()
+        
+        return park
diff --git a/parks/migrations/0006_alter_historicalpark_latitude_and_more.py b/parks/migrations/0006_alter_historicalpark_latitude_and_more.py
index cbd59494..e6b76a8b 100644
--- a/parks/migrations/0006_alter_historicalpark_latitude_and_more.py
+++ b/parks/migrations/0006_alter_historicalpark_latitude_and_more.py
@@ -1,7 +1,6 @@
 # Generated by Django 5.1.2 on 2024-11-03 19:59
 
 import django.core.validators
-import parks.models
 from decimal import Decimal
 from django.db import migrations, models
 
@@ -25,7 +24,6 @@ class Migration(migrations.Migration):
                 validators=[
                     django.core.validators.MinValueValidator(Decimal("-90")),
                     django.core.validators.MaxValueValidator(Decimal("90")),
-                    parks.models.validate_latitude_digits,
                 ],
             ),
         ),
@@ -41,7 +39,6 @@ class Migration(migrations.Migration):
                 validators=[
                     django.core.validators.MinValueValidator(Decimal("-180")),
                     django.core.validators.MaxValueValidator(Decimal("180")),
-                    parks.models.validate_longitude_digits,
                 ],
             ),
         ),
@@ -57,7 +54,6 @@ class Migration(migrations.Migration):
                 validators=[
                     django.core.validators.MinValueValidator(Decimal("-90")),
                     django.core.validators.MaxValueValidator(Decimal("90")),
-                    parks.models.validate_latitude_digits,
                 ],
             ),
         ),
@@ -73,7 +69,6 @@ class Migration(migrations.Migration):
                 validators=[
                     django.core.validators.MinValueValidator(Decimal("-180")),
                     django.core.validators.MaxValueValidator(Decimal("180")),
-                    parks.models.validate_longitude_digits,
                 ],
             ),
         ),
diff --git a/parks/migrations/0008_historicalpark_historicalparkarea.py b/parks/migrations/0008_historicalpark_historicalparkarea.py
index ccbaa5ca..61826d1a 100644
--- a/parks/migrations/0008_historicalpark_historicalparkarea.py
+++ b/parks/migrations/0008_historicalpark_historicalparkarea.py
@@ -3,7 +3,6 @@
 import django.core.validators
 import django.db.models.deletion
 import history_tracking.mixins
-import parks.models
 import simple_history.models
 from decimal import Decimal
 from django.conf import settings
@@ -57,7 +56,6 @@ class Migration(migrations.Migration):
                         validators=[
                             django.core.validators.MinValueValidator(Decimal("-90")),
                             django.core.validators.MaxValueValidator(Decimal("90")),
-                            parks.models.validate_latitude_digits,
                         ],
                     ),
                 ),
@@ -72,7 +70,6 @@ class Migration(migrations.Migration):
                         validators=[
                             django.core.validators.MinValueValidator(Decimal("-180")),
                             django.core.validators.MaxValueValidator(Decimal("180")),
-                            parks.models.validate_longitude_digits,
                         ],
                     ),
                 ),
diff --git a/parks/migrations/0009_migrate_to_location_model.py b/parks/migrations/0009_migrate_to_location_model.py
new file mode 100644
index 00000000..1ed68939
--- /dev/null
+++ b/parks/migrations/0009_migrate_to_location_model.py
@@ -0,0 +1,83 @@
+# Generated by Django 5.1.2 on 2024-11-04 22:21
+
+from django.db import migrations, transaction
+from django.contrib.contenttypes.models import ContentType
+
+def forwards_func(apps, schema_editor):
+    """Move park location data to Location model"""
+    Park = apps.get_model("parks", "Park")
+    Location = apps.get_model("location", "Location")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    db_alias = schema_editor.connection.alias
+
+    # Get content type for Park model
+    park_content_type = ContentType.objects.db_manager(db_alias).get(
+        app_label='parks',
+        model='park'
+    )
+
+    # Move location data for each park
+    with transaction.atomic():
+        for park in Park.objects.using(db_alias).all():
+            # Only create Location if park has coordinate data
+            if park.latitude is not None and park.longitude is not None:
+                Location.objects.using(db_alias).create(
+                    content_type=park_content_type,
+                    object_id=park.id,
+                    name=park.name,
+                    location_type='park',
+                    latitude=park.latitude,
+                    longitude=park.longitude,
+                    street_address=park.street_address,
+                    city=park.city,
+                    state=park.state,
+                    country=park.country,
+                    postal_code=park.postal_code
+                )
+
+def reverse_func(apps, schema_editor):
+    """Move location data back to Park model"""
+    Park = apps.get_model("parks", "Park")
+    Location = apps.get_model("location", "Location")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    db_alias = schema_editor.connection.alias
+
+    # Get content type for Park model
+    park_content_type = ContentType.objects.db_manager(db_alias).get(
+        app_label='parks',
+        model='park'
+    )
+
+    # Move location data back to each park
+    with transaction.atomic():
+        locations = Location.objects.using(db_alias).filter(
+            content_type=park_content_type
+        )
+        for location in locations:
+            try:
+                park = Park.objects.using(db_alias).get(id=location.object_id)
+                park.latitude = location.latitude
+                park.longitude = location.longitude
+                park.street_address = location.street_address
+                park.city = location.city
+                park.state = location.state
+                park.country = location.country
+                park.postal_code = location.postal_code
+                park.save()
+            except Park.DoesNotExist:
+                continue
+
+        # Delete all park locations
+        locations.delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parks', '0008_historicalpark_historicalparkarea'),
+        ('location', '0005_convert_coordinates_to_points'),
+        ('contenttypes', '0002_remove_content_type_name'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, atomic=True),
+    ]
diff --git a/parks/migrations/0010_remove_legacy_location_fields.py b/parks/migrations/0010_remove_legacy_location_fields.py
new file mode 100644
index 00000000..9e42c036
--- /dev/null
+++ b/parks/migrations/0010_remove_legacy_location_fields.py
@@ -0,0 +1,69 @@
+# Generated by Django 5.1.2 on 2024-11-04 22:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("parks", "0009_migrate_to_location_model"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="latitude",
+        ),
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="longitude",
+        ),
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="street_address",
+        ),
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="city",
+        ),
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="state",
+        ),
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="country",
+        ),
+        migrations.RemoveField(
+            model_name="historicalpark",
+            name="postal_code",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="latitude",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="longitude",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="street_address",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="city",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="state",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="country",
+        ),
+        migrations.RemoveField(
+            model_name="park",
+            name="postal_code",
+        ),
+    ]
diff --git a/parks/models.py b/parks/models.py
index ef4396e5..dd38e8c4 100644
--- a/parks/models.py
+++ b/parks/models.py
@@ -2,7 +2,6 @@ from django.db import models
 from django.urls import reverse
 from django.utils.text import slugify
 from django.contrib.contenttypes.fields import GenericRelation
-from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.exceptions import ValidationError
 from decimal import Decimal, ROUND_DOWN, InvalidOperation
 from simple_history.models import HistoricalRecords
@@ -10,48 +9,7 @@ from simple_history.models import HistoricalRecords
 from companies.models import Company
 from media.models import Photo
 from history_tracking.models import HistoricalModel
-
-
-def normalize_coordinate(value, max_digits, decimal_places):
-    """Normalize coordinate to have at most max_digits total digits and decimal_places decimal places"""
-    try:
-        if value is None:
-            return None
-
-        # Convert to Decimal for precise handling
-        value = Decimal(str(value))
-        # Round to specified decimal places
-        value = Decimal(
-            value.quantize(Decimal("0." + "0" * decimal_places), rounding=ROUND_DOWN)
-        )
-
-        return value
-    except (TypeError, ValueError, InvalidOperation):
-        return None
-
-
-def validate_coordinate_digits(value, max_digits, decimal_places):
-    """Validate total number of digits in a coordinate value"""
-    if value is not None:
-        try:
-            # Convert to Decimal for precise handling
-            value = Decimal(str(value))
-            # Round to exactly 6 decimal places
-            value = value.quantize(Decimal("0.000001"), rounding=ROUND_DOWN)
-            return value
-        except (InvalidOperation, TypeError):
-            raise ValidationError("Invalid coordinate value.")
-    return value
-
-
-def validate_latitude_digits(value):
-    """Validate total number of digits in latitude"""
-    return validate_coordinate_digits(value, 9, 6)
-
-
-def validate_longitude_digits(value):
-    """Validate total number of digits in longitude"""
-    return validate_coordinate_digits(value, 10, 6)
+from location.models import Location
 
 
 class Park(HistoricalModel):
@@ -71,36 +29,8 @@ class Park(HistoricalModel):
         max_length=20, choices=STATUS_CHOICES, default="OPERATING"
     )
 
-    # Location fields
-    latitude = models.DecimalField(
-        max_digits=9,
-        decimal_places=6,
-        null=True,
-        blank=True,
-        help_text="Latitude coordinate (-90 to 90)",
-        validators=[
-            MinValueValidator(Decimal("-90")),
-            MaxValueValidator(Decimal("90")),
-            validate_latitude_digits,
-        ],
-    )
-    longitude = models.DecimalField(
-        max_digits=10,
-        decimal_places=6,
-        null=True,
-        blank=True,
-        help_text="Longitude coordinate (-180 to 180)",
-        validators=[
-            MinValueValidator(Decimal("-180")),
-            MaxValueValidator(Decimal("180")),
-            validate_longitude_digits,
-        ],
-    )
-    street_address = models.CharField(max_length=255, blank=True)
-    city = models.CharField(max_length=255, blank=True)
-    state = models.CharField(max_length=255, blank=True)
-    country = models.CharField(max_length=255, blank=True)
-    postal_code = models.CharField(max_length=20, blank=True)
+    # Location fields using GenericRelation
+    location = GenericRelation(Location, related_query_name='park')
 
     # Details
     opening_date = models.DateField(null=True, blank=True)
@@ -138,13 +68,6 @@ class Park(HistoricalModel):
     def save(self, *args, **kwargs):
         if not self.slug:
             self.slug = slugify(self.name)
-
-        # Normalize coordinates before saving
-        if self.latitude is not None:
-            self.latitude = normalize_coordinate(self.latitude, 9, 6)
-        if self.longitude is not None:
-            self.longitude = normalize_coordinate(self.longitude, 10, 6)
-
         super().save(*args, **kwargs)
 
     def get_absolute_url(self):
@@ -152,14 +75,18 @@ class Park(HistoricalModel):
 
     @property
     def formatted_location(self):
-        parts = []
-        if self.city:
-            parts.append(self.city)
-        if self.state:
-            parts.append(self.state)
-        if self.country:
-            parts.append(self.country)
-        return ", ".join(parts)
+        if self.location.exists():
+            location = self.location.first()
+            return location.get_formatted_address()
+        return ""
+
+    @property
+    def coordinates(self):
+        """Returns coordinates as a tuple (latitude, longitude)"""
+        if self.location.exists():
+            location = self.location.first()
+            return location.coordinates
+        return None
 
     @classmethod
     def get_by_slug(cls, slug):
diff --git a/parks/views.py b/parks/views.py
index 572ca76d..987cedda 100644
--- a/parks/views.py
+++ b/parks/views.py
@@ -1,4 +1,4 @@
-from decimal import Decimal, ROUND_DOWN
+from decimal import Decimal, ROUND_DOWN, InvalidOperation
 from django.views.generic import DetailView, ListView, CreateView, UpdateView
 from django.shortcuts import get_object_or_404, render
 from django.core.serializers.json import DjangoJSONEncoder
@@ -16,6 +16,7 @@ from core.views import SlugRedirectMixin
 from moderation.mixins import EditSubmissionMixin, PhotoSubmissionMixin, HistoryMixin
 from moderation.models import EditSubmission
 from media.models import Photo
+from location.models import Location
 
 
 def location_search(request):
@@ -101,7 +102,7 @@ class ParkListView(ListView):
     context_object_name = "parks"
 
     def get_queryset(self):
-        queryset = Park.objects.select_related("owner").prefetch_related("photos")
+        queryset = Park.objects.select_related("owner").prefetch_related("photos", "location")
 
         search = self.request.GET.get("search", "").strip()
         country = self.request.GET.get("country", "").strip()
@@ -111,25 +112,25 @@ class ParkListView(ListView):
 
         if search:
             queryset = queryset.filter(
-                Q(name__icontains=search)
-                | Q(city__icontains=search)
-                | Q(state__icontains=search)
-                | Q(country__icontains=search)
+                Q(name__icontains=search) |
+                Q(location__city__icontains=search) |
+                Q(location__state__icontains=search) |
+                Q(location__country__icontains=search)
             )
 
         if country:
-            queryset = queryset.filter(country__icontains=country)
+            queryset = queryset.filter(location__country__icontains=country)
 
         if region:
-            queryset = queryset.filter(state__icontains=region)
+            queryset = queryset.filter(location__state__icontains=region)
 
         if city:
-            queryset = queryset.filter(city__icontains=city)
+            queryset = queryset.filter(location__city__icontains=city)
 
         if statuses:
             queryset = queryset.filter(status__in=statuses)
 
-        return queryset
+        return queryset.distinct()
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -173,7 +174,8 @@ class ParkDetailView(
             'rides',
             'rides__manufacturer',
             'photos',
-            'areas'
+            'areas',
+            'location'
         )
 
     def get_context_data(self, **kwargs):
@@ -242,6 +244,22 @@ class ParkCreateView(LoginRequiredMixin, CreateView):
                 submission.handled_by = self.request.user
                 submission.save()
 
+                # Create Location record
+                if form.cleaned_data.get("latitude") and form.cleaned_data.get("longitude"):
+                    Location.objects.create(
+                        content_type=ContentType.objects.get_for_model(Park),
+                        object_id=self.object.id,
+                        name=self.object.name,
+                        location_type='park',
+                        latitude=form.cleaned_data["latitude"],
+                        longitude=form.cleaned_data["longitude"],
+                        street_address=form.cleaned_data.get("street_address", ""),
+                        city=form.cleaned_data.get("city", ""),
+                        state=form.cleaned_data.get("state", ""),
+                        country=form.cleaned_data.get("country", ""),
+                        postal_code=form.cleaned_data.get("postal_code", "")
+                    )
+
                 # Handle photo uploads
                 photos = self.request.FILES.getlist("photos")
                 for photo_file in photos:
@@ -349,6 +367,31 @@ class ParkUpdateView(LoginRequiredMixin, UpdateView):
                 submission.handled_by = self.request.user
                 submission.save()
 
+                # Update or create Location record
+                location_data = {
+                    'name': self.object.name,
+                    'location_type': 'park',
+                    'latitude': form.cleaned_data.get("latitude"),
+                    'longitude': form.cleaned_data.get("longitude"),
+                    'street_address': form.cleaned_data.get("street_address", ""),
+                    'city': form.cleaned_data.get("city", ""),
+                    'state': form.cleaned_data.get("state", ""),
+                    'country': form.cleaned_data.get("country", ""),
+                    'postal_code': form.cleaned_data.get("postal_code", "")
+                }
+
+                if self.object.location.exists():
+                    location = self.object.location.first()
+                    for key, value in location_data.items():
+                        setattr(location, key, value)
+                    location.save()
+                else:
+                    Location.objects.create(
+                        content_type=ContentType.objects.get_for_model(Park),
+                        object_id=self.object.id,
+                        **location_data
+                    )
+
                 # Handle photo uploads
                 photos = self.request.FILES.getlist("photos")
                 uploaded_count = 0
diff --git a/static/css/tailwind.css b/static/css/tailwind.css
index 4f32e735..e886bbe3 100644
--- a/static/css/tailwind.css
+++ b/static/css/tailwind.css
@@ -2317,10 +2317,6 @@ select {
   margin-left: 1.5rem;
 }
 
-.mr-0\.5 {
-  margin-right: 0.125rem;
-}
-
 .mr-1 {
   margin-right: 0.25rem;
 }
@@ -3001,11 +2997,6 @@ select {
   padding-right: 2rem;
 }
 
-.py-0\.5 {
-  padding-top: 0.125rem;
-  padding-bottom: 0.125rem;
-}
-
 .py-1 {
   padding-top: 0.25rem;
   padding-bottom: 0.25rem;
@@ -3881,10 +3872,6 @@ select {
     margin-bottom: 4rem;
   }
 
-  .sm\:grid-cols-1 {
-    grid-template-columns: repeat(1, minmax(0, 1fr));
-  }
-
   .sm\:grid-cols-12 {
     grid-template-columns: repeat(12, minmax(0, 1fr));
   }
@@ -3905,6 +3892,11 @@ select {
     margin-left: calc(1.5rem * calc(1 - var(--tw-space-x-reverse)));
   }
 
+  .sm\:px-6 {
+    padding-left: 1.5rem;
+    padding-right: 1.5rem;
+  }
+
   .sm\:text-2xl {
     font-size: 1.5rem;
     line-height: 2rem;
@@ -3925,13 +3917,18 @@ select {
     line-height: 1.25rem;
   }
 
+  .sm\:text-xl {
+    font-size: 1.25rem;
+    line-height: 1.75rem;
+  }
+
   .sm\:text-xs {
     font-size: 0.75rem;
     line-height: 1rem;
   }
 
-  .sm\:text-xl {
-    font-size: 1.25rem;
+  .sm\:text-lg {
+    font-size: 1.125rem;
     line-height: 1.75rem;
   }
 }
@@ -3974,6 +3971,16 @@ select {
     font-size: 3rem;
     line-height: 1;
   }
+
+  .md\:text-xl {
+    font-size: 1.25rem;
+    line-height: 1.75rem;
+  }
+
+  .md\:text-lg {
+    font-size: 1.125rem;
+    line-height: 1.75rem;
+  }
 }
 
 @media (min-width: 1024px) {
@@ -4001,8 +4008,38 @@ select {
     grid-template-columns: repeat(4, minmax(0, 1fr));
   }
 
+  .lg\:px-8 {
+    padding-left: 2rem;
+    padding-right: 2rem;
+  }
+
+  .lg\:text-2xl {
+    font-size: 1.5rem;
+    line-height: 2rem;
+  }
+
+  .lg\:text-3xl {
+    font-size: 1.875rem;
+    line-height: 2.25rem;
+  }
+
+  .lg\:text-4xl {
+    font-size: 2.25rem;
+    line-height: 2.5rem;
+  }
+
   .lg\:text-6xl {
     font-size: 3.75rem;
     line-height: 1;
   }
+
+  .lg\:text-base {
+    font-size: 1rem;
+    line-height: 1.5rem;
+  }
+
+  .lg\:text-lg {
+    font-size: 1.125rem;
+    line-height: 1.75rem;
+  }
 }
diff --git a/templates/parks/park_detail.html b/templates/parks/park_detail.html
index 9f7627f9..5510e04c 100644
--- a/templates/parks/park_detail.html
+++ b/templates/parks/park_detail.html
@@ -4,7 +4,7 @@
 {% block title %}{{ park.name }} - ThrillWiki{% endblock %}
 
 {% block extra_head %}
-{% if park.latitude and park.longitude %}
+{% if park.location.exists %}
 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
 {% endif %}
 {% endblock %}
@@ -19,7 +19,7 @@
     })
 </script>
 
-<div class="container px-4 mx-auto">
+<div class="container px-4 mx-auto sm:px-6 lg:px-8">
     <!-- Action Buttons - Above header -->
     {% if user.is_authenticated %}
     <div class="flex justify-end gap-2 mb-2">
@@ -37,18 +37,16 @@
     {% endif %}
 
     <!-- Header Grid -->
-    <div class="grid grid-cols-1 gap-4 mb-8 sm:grid-cols-12">
+    <div class="grid grid-cols-2 gap-4 mb-8 sm:grid-cols-12">
         <!-- Park Info Card -->
-        <div class="flex flex-col items-center justify-center h-full col-span-1 p-4 text-center bg-white rounded-lg shadow-lg sm:col-span-3 dark:bg-gray-800">
-            <h1 class="text-2xl font-bold leading-tight text-gray-900 sm:text-3xl dark:text-white">{{ park.name }}</h1>
-            
+        <div class="flex flex-col items-center justify-center h-full col-span-2 p-4 text-center bg-white rounded-lg shadow-lg sm:col-span-3 dark:bg-gray-800">
+            <h1 class="text-2xl font-bold leading-tight text-gray-900 sm:text-lg lg:text-4xl md:text-lg dark:text-white">{{ park.name }}</h1>
             {% if park.formatted_location %}
-            <div class="flex items-center justify-center mt-2 text-sm text-gray-600 dark:text-gray-400">
-                <i class="mr-1 fas fa-map-marker-alt"></i>
-                <p>{{ park.formatted_location }}</p>
-            </div>
-            {% endif %}
-
+                    <div class="flex items-center justify-center mt-2 text-sm text-gray-600 dark:text-gray-400">
+                        <i class="mr-1 fas fa-map-marker-alt"></i>
+                        <p>{{ park.formatted_location }}</p>
+                    </div>
+                    {% endif %}
             <div class="flex flex-wrap items-center justify-center gap-2 mt-3">
                 <span class="status-badge text-xs sm:text-sm font-medium py-1 px-3 {% if park.status == 'OPERATING' %}status-operating
                            {% elif park.status == 'CLOSED_TEMP' or park.status == 'CLOSED_PERM' %}status-closed
@@ -67,36 +65,36 @@
         </div>
 
         <!-- Stats and Quick Facts -->
-        <div class="grid h-full grid-cols-12 col-span-1 gap-4 sm:col-span-9">
+        <div class="grid h-full grid-cols-2 col-span-2 gap-4 sm:col-span-9">
             <!-- Stats Column -->
             <div class="grid grid-cols-2 col-span-12 gap-4 sm:col-span-4">
                 <!-- Total Rides Card -->
-                {% if park.total_rides %}
                 <a href="{% url 'parks:rides:ride_list' park.slug %}" 
                    class="flex flex-col items-center justify-center p-4 text-center transition-transform bg-white rounded-lg shadow-lg hover:scale-[1.02] dark:bg-gray-800">
-                    <dt class="text-sm font-semibold text-gray-900 sm:text-base dark:text-white">Total Rides</dt>
-                    <dd class="mt-2 text-xl font-bold text-sky-900 hover:text-sky-800 sm:text-2xl dark:text-sky-400 dark:hover:text-sky-300">{{ park.total_rides }}</dd>
+                    <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Total Rides</dt>
+                    <dd class="mt-2 text-xl font-bold text-sky-900 hover:text-sky-800 sm:text-2xl lg:text-3xl dark:text-sky-400 dark:hover:text-sky-300">
+                        {{ park.total_rides|default:"N/A" }}
+                    </dd>
                 </a>
-                {% endif %}
 
                 <!-- Total Roller Coasters Card -->
-                {% if park.total_roller_coasters %}
                 <div class="flex flex-col items-center justify-center p-4 text-center bg-white rounded-lg shadow-lg dark:bg-gray-800">
-                    <dt class="text-sm font-semibold text-gray-900 sm:text-base dark:text-white">Roller Coasters</dt>
-                    <dd class="mt-2 text-xl font-bold text-sky-900 hover:text-sky-800 sm:text-2xl dark:text-sky-400 dark:hover:text-sky-300">{{ park.total_roller_coasters }}</dd>
+                    <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Roller Coasters</dt>
+                    <dd class="mt-2 text-xl font-bold text-sky-900 hover:text-sky-800 sm:text-2xl lg:text-3xl dark:text-sky-400 dark:hover:text-sky-300">
+                        {{ park.total_roller_coasters|default:"N/A" }}
+                    </dd>
                 </div>
-                {% endif %}
             </div>
 
             <!-- Quick Facts Grid -->
             <div class="grid h-full grid-cols-3 col-span-12 gap-2 p-4 bg-white rounded-lg shadow-lg sm:col-span-8 dark:bg-gray-800">
                 {% if park.owner %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-building dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Owner</dt>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-building dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Owner</dt>
                     <dd>
                         <a href="{% url 'companies:company_detail' park.owner.slug %}" 
-                           class="text-xs text-blue-600 sm:text-sm hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
+                           class="text-xs text-blue-600 sm:text-sm lg:text-base hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
                             {{ park.owner.name }}
                         </a>
                     </dd>
@@ -105,19 +103,19 @@
 
                 {% if park.opening_date %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-calendar-alt dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Opened</dt>
-                    <dd class="text-xs text-gray-900 sm:text-sm dark:text-white">{{ park.opening_date }}</dd>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-calendar-alt dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Opened</dt>
+                    <dd class="text-xs text-gray-900 sm:text-sm lg:text-base dark:text-white">{{ park.opening_date }}</dd>
                 </div>
                 {% endif %}
 
                 {% if park.website %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-globe dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Website</dt>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-globe dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Website</dt>
                     <dd>
                         <a href="{{ park.website }}" 
-                           class="inline-flex items-center text-xs text-blue-600 sm:text-sm hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
+                           class="inline-flex items-center text-xs text-blue-600 sm:text-sm lg:text-base hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
                            target="_blank" rel="noopener noreferrer">
                             Visit
                             <i class="ml-1 text-xs fas fa-external-link-alt"></i>
@@ -186,7 +184,7 @@
         <!-- Right Column - Map and Additional Info -->
         <div class="lg:col-span-1">
             <!-- Location Map -->
-            {% if park.latitude and park.longitude %}
+            {% if park.location.exists %}
                 <div class="p-6 mb-6 bg-white rounded-lg shadow dark:bg-gray-800">
                     <h2 class="mb-4 text-xl font-semibold text-gray-900 dark:text-white">Location</h2>
                     <div id="park-map" class="relative rounded-lg" style="z-index: 0;"></div>
@@ -253,6 +251,7 @@
     </div>
 {% endif %}
 
+
 {% endblock %}
 
 {% block extra_js %}
@@ -260,12 +259,14 @@
 <script src="{% static 'js/photo-gallery.js' %}"></script>
 
 <!-- Map Script (if location exists) -->
-{% if park.latitude and park.longitude %}
+{% if park.location.exists %}
 <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
 <script src="{% static 'js/park-map.js' %}"></script>
 <script>
     document.addEventListener('DOMContentLoaded', function() {
-        initParkMap({{ park.latitude }}, {{ park.longitude }}, "{{ park.name }}");
+        {% with location=park.location.first %}
+        initParkMap({{ location.latitude }}, {{ location.longitude }}, "{{ park.name }}");
+        {% endwith %}
     });
 </script>
 {% endif %}
diff --git a/templates/rides/ride_detail.html b/templates/rides/ride_detail.html
index 7392df59..a27cd5fd 100644
--- a/templates/rides/ride_detail.html
+++ b/templates/rides/ride_detail.html
@@ -4,7 +4,7 @@
 {% block title %}{{ ride.name }} at {{ ride.park.name }} - ThrillWiki{% endblock %}
 
 {% block content %}
-<div class="container px-4 mx-auto">
+<div class="container px-4 mx-auto sm:px-6 lg:px-8">
     <!-- Action Buttons - Above header -->
     {% if user.is_authenticated %}
     <div class="flex justify-end gap-2 mb-2">
@@ -25,7 +25,7 @@
     <div class="grid grid-cols-1 gap-4 mb-8 sm:grid-cols-12">
         <!-- Ride Info Card -->
         <div class="flex flex-col items-center justify-center h-full col-span-1 p-4 text-center bg-white rounded-lg shadow-lg sm:col-span-3 dark:bg-gray-800">
-            <h1 class="text-2xl font-bold leading-tight text-gray-900 sm:text-3xl dark:text-white">{{ ride.name }}</h1>
+            <h1 class="text-2xl font-bold leading-tight text-gray-900 sm:text-3xl lg:text-4xl dark:text-white">{{ ride.name }}</h1>
             
             <div class="flex items-center justify-center mt-2 text-sm text-gray-600 dark:text-gray-400">
                 at <a href="{% url 'parks:park_detail' ride.park.slug %}" class="ml-1 text-blue-500 hover:text-blue-600 dark:text-blue-400 dark:hover:text-blue-300">
@@ -37,18 +37,18 @@
             </div>
 
             <div class="flex flex-wrap items-center justify-center gap-2 mt-3">
-                <span class="px-3 py-1 text-xs font-medium status-badge sm:text-sm {% if ride.status == 'OPERATING' %}status-operating
+                <span class="px-3 py-1 text-xs font-medium status-badge sm:text-sm lg:text-base {% if ride.status == 'OPERATING' %}status-operating
                     {% elif ride.status == 'CLOSED_TEMP' or ride.status == 'CLOSED_PERM' %}status-closed
                     {% elif ride.status == 'UNDER_CONSTRUCTION' %}status-construction
                     {% elif ride.status == 'DEMOLISHED' %}status-demolished
                     {% elif ride.status == 'RELOCATED' %}status-relocated{% endif %}">
                     {{ ride.get_status_display }}
                 </span>
-                <span class="px-3 py-1 text-xs font-medium text-blue-800 bg-blue-100 status-badge sm:text-sm dark:bg-blue-700 dark:text-blue-50">
+                <span class="px-3 py-1 text-xs font-medium text-blue-800 bg-blue-100 status-badge sm:text-sm lg:text-base dark:bg-blue-700 dark:text-blue-50">
                     {{ ride.get_category_display }}
                 </span>
                 {% if ride.average_rating %}
-                    <span class="flex items-center px-3 py-1 text-xs font-medium text-yellow-800 bg-yellow-100 status-badge sm:text-sm dark:bg-yellow-600 dark:text-yellow-50">
+                    <span class="flex items-center px-3 py-1 text-xs font-medium text-yellow-800 bg-yellow-100 status-badge sm:text-sm lg:text-base dark:bg-yellow-600 dark:text-yellow-50">
                         <span class="mr-1 text-yellow-500 dark:text-yellow-200">★</span>
                         {{ ride.average_rating|floatformat:1 }}/10
                     </span>
@@ -63,28 +63,32 @@
                 {% if coaster_stats %}
                     {% if coaster_stats.height_ft %}
                     <div class="flex flex-col items-center justify-center p-4 text-center bg-white rounded-lg shadow-lg dark:bg-gray-800">
-                        <dt class="text-sm font-semibold text-gray-900 sm:text-base dark:text-white">Height</dt>
-                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl dark:text-sky-400">{{ coaster_stats.height_ft }} ft</dd>
+                        <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Height</dt>
+                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl lg:text-3xl dark:text-sky-400">{{ coaster_stats.height_ft }} ft</dd>
                     </div>
                     {% endif %}
                     {% if coaster_stats.speed_mph %}
                     <div class="flex flex-col items-center justify-center p-4 text-center bg-white rounded-lg shadow-lg dark:bg-gray-800">
-                        <dt class="text-sm font-semibold text-gray-900 sm:text-base dark:text-white">Speed</dt>
-                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl dark:text-sky-400">{{ coaster_stats.speed_mph }} mph</dd>
+                        <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Speed</dt>
+                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl lg:text-3xl dark:text-sky-400">{{ coaster_stats.speed_mph }} mph</dd>
                     </div>
                     {% endif %}
                     {% if coaster_stats.inversions %}
                     <div class="flex flex-col items-center justify-center p-4 text-center bg-white rounded-lg shadow-lg dark:bg-gray-800">
-                        <dt class="text-sm font-semibold text-gray-900 sm:text-base dark:text-white">Inversions</dt>
-                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl dark:text-sky-400">{{ coaster_stats.inversions }}</dd>
+                        <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Inversions</dt>
+                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl lg:text-3xl dark:text-sky-400">{{ coaster_stats.inversions }}</dd>
                     </div>
                     {% endif %}
                     {% if coaster_stats.length_ft %}
                     <div class="flex flex-col items-center justify-center p-4 text-center bg-white rounded-lg shadow-lg dark:bg-gray-800">
-                        <dt class="text-sm font-semibold text-gray-900 sm:text-base dark:text-white">Length</dt>
-                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl dark:text-sky-400">{{ coaster_stats.length_ft }} ft</dd>
+                        <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Length</dt>
+                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl lg:text-3xl dark:text-sky-400">{{ coaster_stats.length_ft }} ft</dd>
+                    </div>
+                    {% else %}
+                    <div class="flex flex-col items-center justify-center p-4 text-center bg-white rounded-lg shadow-lg dark:bg-gray-800">
+                        <dt class="text-sm font-semibold text-gray-900 sm:text-base lg:text-lg dark:text-white">Length</dt>
+                        <dd class="mt-2 text-xl font-bold text-sky-900 sm:text-2xl lg:text-3xl dark:text-sky-400">N/A</dd>
                     </div>
-                    {% endif %}
                 {% endif %}
             </div>
 
@@ -92,24 +96,20 @@
             <div class="grid h-full grid-cols-3 col-span-12 gap-2 p-4 bg-white rounded-lg shadow-lg sm:col-span-8 dark:bg-gray-800">
                 {% if ride.manufacturer %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-industry dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Manufacturer</dt>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-industry dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Manufacturer</dt>
                     <dd>
                         <a href="{% url 'companies:manufacturer_detail' ride.manufacturer.slug %}" 
-                           class="text-xs text-blue-600 sm:text-sm hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
-                            {{ ride.manufacturer.name }}
-                        </a>
-                    </dd>
-                </div>
+                           class="text-xs text-blue-600 sm:text-sm lg:text-base hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
                 {% endif %}
 
                 {% if ride.designer %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-drafting-compass dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Designer</dt>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-drafting-compass dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Designer</dt>
                     <dd>
                         <a href="{% url 'designers:designer_detail' ride.designer.slug %}" 
-                           class="text-xs text-blue-600 sm:text-sm hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
+                           class="text-xs text-blue-600 sm:text-sm lg:text-base hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
                             {{ ride.designer.name }}
                         </a>
                     </dd>
@@ -118,41 +118,41 @@
 
                 {% if coaster_stats.roller_coaster_type %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-train dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Coaster Type</dt>
-                    <dd class="text-xs text-gray-900 sm:text-sm dark:text-white">{{ coaster_stats.get_roller_coaster_type_display }}</dd>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-train dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Coaster Type</dt>
+                    <dd class="text-xs text-gray-900 sm:text-sm lg:text-base dark:text-white">{{ coaster_stats.get_roller_coaster_type_display }}</dd>
                 </div>
                 {% endif %}
 
                 {% if coaster_stats.track_material %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-layer-group dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Track Material</dt>
-                    <dd class="text-xs text-gray-900 sm:text-sm dark:text-white">{{ coaster_stats.get_track_material_display }}</dd>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-layer-group dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Track Material</dt>
+                    <dd class="text-xs text-gray-900 sm:text-sm lg:text-base dark:text-white">{{ coaster_stats.get_track_material_display }}</dd>
                 </div>
                 {% endif %}
 
                 {% if ride.opening_date %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-calendar-alt dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Opened</dt>
-                    <dd class="text-xs text-gray-900 sm:text-sm dark:text-white">{{ ride.opening_date }}</dd>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-calendar-alt dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Opened</dt>
+                    <dd class="text-xs text-gray-900 sm:text-sm lg:text-base dark:text-white">{{ ride.opening_date }}</dd>
                 </div>
                 {% endif %}
 
                 {% if ride.capacity_per_hour %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-users dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Capacity</dt>
-                    <dd class="text-xs text-gray-900 sm:text-sm dark:text-white">{{ ride.capacity_per_hour }}/hr</dd>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-users dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Capacity</dt>
+                    <dd class="text-xs text-gray-900 sm:text-sm lg:text-base dark:text-white">{{ ride.capacity_per_hour }}/hr</dd>
                 </div>
                 {% endif %}
 
                 {% if coaster_stats.launch_type %}
                 <div class="flex flex-col items-center justify-center p-2 text-center">
-                    <i class="text-lg text-blue-600 sm:text-xl fas fa-rocket dark:text-blue-400"></i>
-                    <dt class="mt-1 text-xs font-medium text-gray-500 dark:text-gray-400">Launch Type</dt>
-                    <dd class="text-xs text-gray-900 sm:text-sm dark:text-white">{{ coaster_stats.get_launch_type_display }}</dd>
+                    <i class="text-lg text-blue-600 sm:text-xl lg:text-2xl fas fa-rocket dark:text-blue-400"></i>
+                    <dt class="mt-1 text-xs font-medium text-gray-500 sm:text-sm lg:text-base dark:text-gray-400">Launch Type</dt>
+                    <dd class="text-xs text-gray-900 sm:text-sm lg:text-base dark:text-white">{{ coaster_stats.get_launch_type_display }}</dd>
                 </div>
                 {% endif %}
             </div>
diff --git a/thrillwiki/__pycache__/settings.cpython-312.pyc b/thrillwiki/__pycache__/settings.cpython-312.pyc
index 67b8dc4fb253cf0b7bfe25bbf25d2c5c1798c6f9..2da92e9bc7707840419c9d1ee90aa891d04396f2 100644
GIT binary patch
delta 196
zcmZqIU8l=?nwOW00SGR*Yo_OJ<Xz9qs4#gi^BUnQp_Ht|y!3p%<ovvnqRb?{^vul}
zEP0Gvw>Wb0lM_oa^Yb=eW3^&YSHn<Ote29cmz0>Cotl?YtXGg<T#}wyJXw!xt+Eu*
zqFWq3{?3jep8kHf*h4&hUHwBtie!P}FBySEk@Dt$ToKG{Rv@<Z<`}*-R>p?OhlOL<
b6@{1@_&&K!Ruc(kwAx%H!pX!^2UG+AeOo)^

delta 156
zcmZ3d+pf!dnwOW00SI<UYNQKn<Xz9qC^va8^P0`IEV+!Ezpz@d$jPQ;CFZ5)>!l>=
zB_$?jr{<*;>lNe|m!ub^78mAB4&_>_ED1E=7Ke|&vtx*-zuztP5KmuM|Im;k8KC$}
zMj%n7v{{uqf|<<{#J1Yp%$LT>SU>rda16V=5K{x+C#T82BEgJ?n-_|3GO^SG6#)QW
C6)b!J

diff --git a/thrillwiki/settings.py b/thrillwiki/settings.py
index 07963d12..80e76d9f 100644
--- a/thrillwiki/settings.py
+++ b/thrillwiki/settings.py
@@ -24,6 +24,7 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.sites",
+    "django.contrib.gis",  # Add GeoDjango
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
@@ -47,6 +48,7 @@ INSTALLED_APPS = [
     "history_tracking",
     "designers",
     "analytics",
+    "location",
 ]
 
 MIDDLEWARE = [
@@ -90,7 +92,7 @@ WSGI_APPLICATION = "thrillwiki.wsgi.application"
 # Database
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql",
+        "ENGINE": "django.contrib.gis.db.backends.postgis",  # Update to use PostGIS
         "NAME": "thrillwiki",
         "USER": "wiki",
         "PASSWORD": "thrillwiki",