Merge pull request #1 from Zulko/zulko/sql-queries

Zulko/sql queries

Author: Zulko

README.md

@@ -0,0 +1,126 @@
+def encode_hybrid(lat, lon, base4_precision=8):
+    # Start with base32 encoding for the first character
+    lat_range = [-90, 90]
+    lon_range = [-180, 180]
+    _base32 = "0123456789bcdefghjkmnpqrstuvwxyz"
+
+    hashcode = ""
+    bits = [16, 8, 4, 2, 1]
+    bit = 0
+    ch = 0
+
+    # First char (base32, 5 bits)
+    for i in range(5):
+        if bit % 2 == 0:
+            mid = (lon_range[0] + lon_range[1]) / 2
+            if lon > mid:
+                ch |= bits[i]
+                lon_range[0] = mid
+            else:
+                lon_range[1] = mid
+        else:
+            mid = (lat_range[0] + lat_range[1]) / 2
+            if lat > mid:
+                ch |= bits[i]
+                lat_range[0] = mid
+            else:
+                lat_range[1] = mid
+        bit += 1
+    hashcode += _base32[ch]
+
+    # Now subsequent chars: base4 encoding (quadtree)
+    for _ in range(base4_precision):
+        mid_lat = (lat_range[0] + lat_range[1]) / 2
+        mid_lon = (lon_range[0] + lon_range[1]) / 2
+
+        quadrant = 0
+        if lat >= mid_lat:
+            quadrant += 2  # north
+            lat_range[0] = mid_lat
+        else:
+            lat_range[1] = mid_lat
+
+        if lon >= mid_lon:
+            quadrant += 1  # east
+            lon_range[0] = mid_lon
+        else:
+            lon_range[1] = mid_lon
+
+        hashcode += str(quadrant)
+
+    return hashcode
+
+
+def decode_hybrid(hashcode):
+    """
+    Decode a hybrid geohash (base32 + base4) to its bounding box.
+
+    Args:
+        hashcode (str): The hybrid geohash to decode
+
+    Returns:
+        tuple: (minLat, minLon, maxLat, maxLon) representing the bounding box
+    """
+
+    # Initialize coordinate ranges
+    lat_range = [-90, 90]
+    lon_range = [-180, 180]
+
+    # Base32 decoding for first character
+    _base32 = "0123456789bcdefghjkmnpqrstuvwxyz"
+    first_char = hashcode[0].lower()
+
+    try:
+        ch = _base32.index(first_char)
+    except ValueError:
+        raise ValueError(f"Invalid base32 character: {first_char}")
+
+    # Decode the first character (base32, 5 bits)
+    bits = [16, 8, 4, 2, 1]
+    bit = 0
+
+    for i in range(5):
+        if bit % 2 == 0:  # Even bits encode longitude
+            mid = (lon_range[0] + lon_range[1]) / 2
+            if ch & bits[i]:
+                lon_range[0] = mid
+            else:
+                lon_range[1] = mid
+        else:  # Odd bits encode latitude
+            mid = (lat_range[0] + lat_range[1]) / 2
+            if ch & bits[i]:
+                lat_range[0] = mid
+            else:
+                lat_range[1] = mid
+        bit += 1
+
+    # Decode the remaining characters (base4 quadtree)
+    for char in hashcode[1:]:
+        try:
+            quadrant = int(char)
+            if quadrant < 0 or quadrant > 3:
+                raise ValueError
+        except ValueError:
+            raise ValueError(f"Invalid base4 character: {char}")
+
+        mid_lat = (lat_range[0] + lat_range[1]) / 2
+        mid_lon = (lon_range[0] + lon_range[1]) / 2
+
+        # Decode quadrant
+        # 0: SW, 1: SE, 2: NW, 3: NE
+        if quadrant & 2:  # North (2 or 3)
+            lat_range[0] = mid_lat
+        else:  # South (0 or 1)
+            lat_range[1] = mid_lat
+
+        if quadrant & 1:  # East (1 or 3)
+            lon_range[0] = mid_lon
+        else:  # West (0 or 2)
+            lon_range[1] = mid_lon
+
+    return {
+        "min_lat": lat_range[0],
+        "min_lon": lon_range[0],
+        "max_lat": lat_range[1],
+        "max_lon": lon_range[1],
+    }

geodata_curation/geodata_curation.ipynb

@@ -6,13 +6,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="Explore Wikipedia articles on an interactive map. Discover landmarks, cities, natural features and historical sites around the world through a geographic interface to Wikipedia." />
     <meta name="keywords" content="wikipedia, map, geography, landmarks, cities, exploration, interactive map, world map" />
-    <meta property="og:title" content="World of Wikipedia" />
+    <meta property="og:title" content="Landnotes" />
     <meta property="og:description" content="Explore Wikipedia articles on an interactive map. Discover landmarks, cities, natural features and historical sites around the world." />
     <meta property="og:type" content="website" />
     <meta name="twitter:card" content="summary" />
-    <meta name="twitter:title" content="World of Wikipedia" />
+    <meta name="twitter:title" content="Landnotes" />
     <meta name="twitter:description" content="Explore Wikipedia articles on an interactive map. Discover landmarks, cities, natural features and historical sites around the world." />
-    <title>World of Wikipedia</title>
+    <title>Landnotes</title>
   </head>
   <body>
     <div id="app"></div>

geodata_curation/hybrid_geoencoding.py

@@ -1,5 +1,5 @@
 {
-  "name": "world_of_wikipedia",
+  "name": "landnotes",
   "private": true,
   "version": "0.1.0",
   "type": "module",
@@ -14,10 +14,7 @@
     "vite": "^6.2.0"
   },
   "dependencies": {
-    "fuse.js": "^7.1.0",
-    "latlon-geohash": "^2.0.0",
-    "leaflet": "^1.9.4",
-    "ngeohash": "^0.6.3",
-    "pako": "^2.1.0"
+    "jszip": "^3.10.1",
+    "leaflet": "^1.9.4"
   }
 }