From c014bacf4b714b9daf58a12e3cde6fabae5d9a54 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 22:07:10 -0600
Subject: [PATCH 1/8] Add 2023 Itasca County Leaf Off Imagery

---
 .gitignore                    |  1 +
 Makefile                      |  4 ++++
 map.html                      |  9 +++++++++
 scripts/download_satellite.py | 28 ++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100755 scripts/download_satellite.py

diff --git a/.gitignore b/.gitignore
index ead56f2..e39f80c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 data/plats.geojson
+satellite/
diff --git a/Makefile b/Makefile
index 040dd87..b145c8d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,6 @@
 plats.json: scripts/get_plats.py
 	./scripts/get_plats.py data/plats.geojson
+
+.PHONY: satellite
+satellite:
+	./scripts/download_satellite.py
diff --git a/map.html b/map.html
index 475b983..947b7cb 100644
--- a/map.html
+++ b/map.html
@@ -68,6 +68,15 @@
             //     maxZoom: 19,
             //     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
             // }).addTo(map);
+            L.tileLayer('./satellite/{z}/{x}/{y}.png', {
+                minNativeZoom: 12,
+                maxNativeZoom: 20,
+                bounds: [
+                    [47.517085, -93.427584],
+                    [47.457925, -93.340026],
+                ],
+            }).addTo(map);
+
 
             // Make these requests in parallel
             const track_req_promise = fetch('data/track.geojson');
diff --git a/scripts/download_satellite.py b/scripts/download_satellite.py
new file mode 100755
index 0000000..c7622f8
--- /dev/null
+++ b/scripts/download_satellite.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --quiet -p python3 -i python
+
+# https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts?SERVICE=WMTS&REQUEST=GetCapabilities
+
+import os
+import urllib.request
+
+MAX_ZOOM=20
+
+current, total = 0, (4 ** (MAX_ZOOM - 11) - 1)//3
+
+for z in range(12, MAX_ZOOM+1):
+    scale = 2 ** (z - 12)
+    start_x = 985 * scale
+    start_y = 1432 * scale
+    for x in range(start_x, start_x + scale):
+        for y in range(start_y, start_y + scale):
+            current += 1
+            progress = f"[{current:0{len(str(total))}d}/{total}]"
+            url = f"https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts/PICT-MNITAS23-EDVs7UTOVt/default/GoogleMapsCompatible/{z}/{x}/{y}.png"
+            file = os.path.normpath(os.path.join(os.path.dirname(__file__), f"../satellite/{z}/{x}/{y}.png"))
+            os.makedirs(os.path.dirname(file), exist_ok=True)
+            if os.path.isfile(file):
+                print(f"{progress} {file} already exists; skipping")
+                continue
+            print(f"{progress} downloading {file}")
+            urllib.request.urlretrieve(url, file)

From 453395690212bf3a6a71c08f61bbc1560882ce12 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 22:08:07 -0600
Subject: [PATCH 2/8] Add Makefile deploy target

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index b145c8d..363c1ef 100644
--- a/Makefile
+++ b/Makefile
@@ -4,3 +4,7 @@ plats.json: scripts/get_plats.py
 .PHONY: satellite
 satellite:
 	./scripts/download_satellite.py
+
+.PHONY: deploy
+deploy: plats.json satellite
+	rsync -avz ./ bert:/srv/www/lawrencedeerclub.chandlerswift.com/

From fb1ad615d05015f4810899a6a3eb0ef6058cdcc1 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 22:08:40 -0600
Subject: [PATCH 3/8] Constrain map Zoom and bounds

---
 map.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/map.html b/map.html
index 947b7cb..f1a213e 100644
--- a/map.html
+++ b/map.html
@@ -63,7 +63,14 @@
     <div id="popupcontainer" class="leaflet-container"></div>
     <script>
         (async function() {
-            const map = L.map('map').setView([94.505, -0.09], 13);
+            const map = L.map('map', {
+                minZoom: 12,
+                maxZoom: 21,
+                maxBounds: [
+                    [47.517085, -93.427584],
+                    [47.457925, -93.340026],
+                ],
+            }).setView([94.505, -0.09], 13);
             // L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
             //     maxZoom: 19,
             //     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'

From fb1d3947b76d1e0c3049c71db64da90625512c41 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 22:34:29 -0600
Subject: [PATCH 4/8] Add basic detection/recovery of corrupt partial downloads

---
 scripts/download_satellite.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/download_satellite.py b/scripts/download_satellite.py
index c7622f8..d0f083c 100755
--- a/scripts/download_satellite.py
+++ b/scripts/download_satellite.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env nix-shell
-#!nix-shell --quiet -p python3 -i python
+#!nix-shell --quiet -p python312 -p python312Packages.pillow -i python
 
 # https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts?SERVICE=WMTS&REQUEST=GetCapabilities
 
 import os
 import urllib.request
+from PIL import Image
 
 MAX_ZOOM=20
 
@@ -22,7 +23,12 @@ for z in range(12, MAX_ZOOM+1):
             file = os.path.normpath(os.path.join(os.path.dirname(__file__), f"../satellite/{z}/{x}/{y}.png"))
             os.makedirs(os.path.dirname(file), exist_ok=True)
             if os.path.isfile(file):
-                print(f"{progress} {file} already exists; skipping")
-                continue
-            print(f"{progress} downloading {file}")
+                try: # does it already exist and look good?
+                    Image.open(file).verify() # CRC check on PNGs; nothing on other file types? https://pillow.readthedocs.io/en/latest/_modules/PIL/PngImagePlugin.html#ChunkStream.verify
+                    print(f"{progress} {file} already exists; skipping")
+                    continue
+                except OSError as e:
+                    print(f"{progress} replacing corrupt {file}")
+            else:
+                print(f"{progress} downloading {file}")
             urllib.request.urlretrieve(url, file)

From 068a0e908b527ea8609a3987ba2808799f074159 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 23:14:29 -0600
Subject: [PATCH 5/8] Multithread satellite imagery downloading

---
 scripts/download_satellite.py | 51 ++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/scripts/download_satellite.py b/scripts/download_satellite.py
index d0f083c..518dea6 100755
--- a/scripts/download_satellite.py
+++ b/scripts/download_satellite.py
@@ -6,29 +6,36 @@
 import os
 import urllib.request
 from PIL import Image
+from concurrent.futures import ThreadPoolExecutor
 
 MAX_ZOOM=20
 
-current, total = 0, (4 ** (MAX_ZOOM - 11) - 1)//3
+def download_all():
+    current, total = 0, (4 ** (MAX_ZOOM - 11) - 1)//3
+    with ThreadPoolExecutor() as executor:
+        for z in range(12, MAX_ZOOM + 1):
+            scale = 2 ** (z - 12)
+            start_x = 985 * scale
+            start_y = 1432 * scale
+            for x in range(start_x, start_x + scale):
+                for y in range(start_y, start_y + scale):
+                    executor.submit(download_image, z, x, y, total, current)
+                    current += 1
 
-for z in range(12, MAX_ZOOM+1):
-    scale = 2 ** (z - 12)
-    start_x = 985 * scale
-    start_y = 1432 * scale
-    for x in range(start_x, start_x + scale):
-        for y in range(start_y, start_y + scale):
-            current += 1
-            progress = f"[{current:0{len(str(total))}d}/{total}]"
-            url = f"https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts/PICT-MNITAS23-EDVs7UTOVt/default/GoogleMapsCompatible/{z}/{x}/{y}.png"
-            file = os.path.normpath(os.path.join(os.path.dirname(__file__), f"../satellite/{z}/{x}/{y}.png"))
-            os.makedirs(os.path.dirname(file), exist_ok=True)
-            if os.path.isfile(file):
-                try: # does it already exist and look good?
-                    Image.open(file).verify() # CRC check on PNGs; nothing on other file types? https://pillow.readthedocs.io/en/latest/_modules/PIL/PngImagePlugin.html#ChunkStream.verify
-                    print(f"{progress} {file} already exists; skipping")
-                    continue
-                except OSError as e:
-                    print(f"{progress} replacing corrupt {file}")
-            else:
-                print(f"{progress} downloading {file}")
-            urllib.request.urlretrieve(url, file)
+def download_image(z, x, y, total, current):
+    progress = f"[{current:0{len(str(total))}d}/{total}]"
+    url = f"https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts/PICT-MNITAS23-EDVs7UTOVt/default/GoogleMapsCompatible/{z}/{x}/{y}.png"
+    file = os.path.normpath(os.path.join(os.path.dirname(__file__), f"../satellite/{z}/{x}/{y}.png"))
+    os.makedirs(os.path.dirname(file), exist_ok=True)
+    if os.path.isfile(file):
+        try: # does it already exist and look good?
+            Image.open(file).verify() # CRC check on PNGs; nothing on other file types? https://pillow.readthedocs.io/en/latest/_modules/PIL/PngImagePlugin.html#ChunkStream.verify
+            print(f"{progress} {file} already exists; skipping")
+            return
+        except OSError as e:
+            print(f"{progress} replacing corrupt {file}")
+    else:
+        print(f"{progress} downloading {file}")
+    urllib.request.urlretrieve(url, file)
+
+download_all()

From cad51e93db7e6100c7c660444ecd3d9085a3d82c Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 23:23:45 -0600
Subject: [PATCH 6/8] Switch satellite imagery PNG->JPG for better compression

---
 scripts/download_satellite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/download_satellite.py b/scripts/download_satellite.py
index 518dea6..0c12903 100755
--- a/scripts/download_satellite.py
+++ b/scripts/download_satellite.py
@@ -24,8 +24,8 @@ def download_all():
 
 def download_image(z, x, y, total, current):
     progress = f"[{current:0{len(str(total))}d}/{total}]"
-    url = f"https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts/PICT-MNITAS23-EDVs7UTOVt/default/GoogleMapsCompatible/{z}/{x}/{y}.png"
-    file = os.path.normpath(os.path.join(os.path.dirname(__file__), f"../satellite/{z}/{x}/{y}.png"))
+    url = f"https://svc.pictometry.com/Image/D2B06344-7A2D-5BD0-FC89-DFDDC9888C41/wmts/PICT-MNITAS23-EDVs7UTOVt/default/GoogleMapsCompatible/{z}/{x}/{y}.jpg"
+    file = os.path.normpath(os.path.join(os.path.dirname(__file__), f"../satellite/{z}/{x}/{y}.jpg"))
     os.makedirs(os.path.dirname(file), exist_ok=True)
     if os.path.isfile(file):
         try: # does it already exist and look good?

From 88d3c548ba71c08cf476d5ddc172814fc67f6137 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 23:24:29 -0600
Subject: [PATCH 7/8] Set track color to maroon

---
 map.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/map.html b/map.html
index f1a213e..47b0aa5 100644
--- a/map.html
+++ b/map.html
@@ -96,7 +96,11 @@
             const plats = await plats_req.json();
             const data = await data_req.json();
 
-            L.geoJSON(track).addTo(map);
+            L.geoJSON(track, {
+                style: {
+                    color: "maroon",
+                },
+            }).addTo(map);
 
             L.geoJSON(plats, {
                 filter: feature => !feature.properties.TAO_NAME.toLowerCase().includes("lawrence deer club"),

From ec3c151a52d74131e8843362c507143e0d24ede3 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 2 Jan 2025 23:24:51 -0600
Subject: [PATCH 8/8] Place track on top of plats

---
 map.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/map.html b/map.html
index 47b0aa5..efedb45 100644
--- a/map.html
+++ b/map.html
@@ -96,12 +96,6 @@
             const plats = await plats_req.json();
             const data = await data_req.json();
 
-            L.geoJSON(track, {
-                style: {
-                    color: "maroon",
-                },
-            }).addTo(map);
-
             L.geoJSON(plats, {
                 filter: feature => !feature.properties.TAO_NAME.toLowerCase().includes("lawrence deer club"),
                 onEachFeature: function(feature, layer) {
@@ -121,6 +115,12 @@
                 },
             }).addTo(map);
 
+            L.geoJSON(track, {
+                style: {
+                    color: "maroon",
+                },
+            }).addTo(map);
+
             for (let stand of data.stands) {
                 if (stand.location) {
                     const marker = L.marker(stand.location).addTo(map);