From f06952e8cd8ac0fc32a69fb393d4910cf31cfda6 Mon Sep 17 00:00:00 2001
From: John Peck <stoat@stoat.org>
Date: Sun, 7 Dec 2025 04:37:09 +0000
Subject: [PATCH] buckeye needs fixing, it's about 5 miles off

---
 .../get_rpc_config_auto.cpython-310.pyc       | Bin 3297 -> 3143 bytes
 newpower2.py                                  |  76 +++++++++++++++++-
 providers.json                                |   6 ++
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/__pycache__/get_rpc_config_auto.cpython-310.pyc b/__pycache__/get_rpc_config_auto.cpython-310.pyc
index 4b0576e2637f7d03c5feed92c388803228c725e2..b3d2f0f6a4d8f836b7d674d786b7785619a45351 100644
GIT binary patch
delta 443
zcmYjNO-mb56utMo$;_LNG{%T%Au_fFktAZkl?xRu?W(0<q$qSza-TL45}AxBVMZ4b
zH47Da;HF5^f1u<ibkTK}U6#6Y<33&VO&8Jw=iYNJ95~!x<KM>$&2-uUjs3w~?I8{D
zJ2C%*X|tr+qRYZUVMYpaI=Ep=Q`&kv(g|jzOKt}d2v;9D?cLtIV`b<vf-Vxonq3I7
z0~h--i&&l2IdL+!kWyzX<`J(OWRj)IJhv{$J`%Bc!Zwi{a<#UiRL>+YGQTo}e>xpm
ziEb~nC!$o{ih!O_hK9~KLMSNP!I$vCjm0SoDhLfTw0jN>t84yzJQvxY;hH6l-@`iS
zZuWuQND-)?d=fzo_*8!6Z97*gmHg$Px!00`|4N3{PxF4;@b$HSX?#O`(O)yq5sUph
z>lhLH+x8*i8+Gq2qNR%NRpxc_wNX8WP%y#N54Y^+S9hyb*=kMtD<5~l-9VDxkb8c$
l+1RXY%}jf0$*ZU@-m{6PIwwG&mt?b|tcd~*?TtSM{|h~vWCs8M

delta 628
zcmYjO-)j>=5Z>9nyX;+lHK`T@61EhnrNkokDM-{>R1`|3DWc%RC9`P~L!x&VYmYml
zM2vZeA}79xko*af=RW&C_#)zi|AHWbn<~YDZ}$7X8D<9d^QmvS)lM>L5fx{Dt~YL_
z3Hd$~|A(%`Wd--y+tt$bi;|<&hkK?pq^Vv@T24vEF)kC*!bFbrp-+J*C#iHQN5;ts
znK=kM$5=^!dbdq`Y)Fv}0a>UpBp&q1n<pU+Xp=S>YN+o48Y3FAfHgIYAs<1g1=?7j
zkWe3x0n{j(XuaT}F`zZTI3^U21^U>)WME9x)+3$@Vl(cS{CuD{V*$Z5&S54$Vn95O
z**<KN`|*&!qD~n|+wjb>h4ayKwv;;&m><YT+6N$a$X%jNHJ_So9a(h97J)@y*>dls
zzikN>yRLMFEgWgLM8)asyV4O}N7STOtqZh0TU^=N6jl47*L9@u>QXrNzG{Eem98gH
zdUm7bo;w=l&ld^>vGH%nwb_KC@HL^_t+KB&He9>Xl7&jEF}<Ko0hXsf^w$7u)5o!w
z0NV67?*ZJ7LhBOcYtf<gK7DichYKpr0jHcrmH7Emey3ZlO4nT!SO1=cVxxlxq9xmV
zUcKn-s&+qfT)QD{l#W|;&M1E+6;0!1E2-!g?SVXSBO|dSPAka?hs112hOhH12M!u!
KVF9#X8v6t6M47Yz

diff --git a/newpower2.py b/newpower2.py
index 17562dd..0cb7212 100644
--- a/newpower2.py
+++ b/newpower2.py
@@ -447,12 +447,86 @@ class GwtRpcProvider(BaseProvider):
         if not b: return True
         return b['lat_min'] <= lat <= b['lat_max'] and b['lon_min'] <= lon <= b['lon_max']
 
+class NiscHostedProvider(BaseProvider):
+    """
+    Handles NISC Cloud Coop format (JSON with PROJ coordinate strings).
+    Example: Buckeye REC
+    """
+    def __init__(self, config, session):
+        super().__init__(config, session)
+        self.transformer = None
+        proj_str = config.get('proj_string')
+        
+        if proj_str:
+            try:
+                # Create transformer from the custom PROJ string to WGS84
+                # always_xy=True ensures we assume (Lon, Lat) output order
+                self.transformer = Transformer.from_proj(proj_str, "EPSG:4326", always_xy=True)
+            except Exception as e:
+                logger.error(f"Failed to initialize projection for {self.name}: {e}")
+
+    def fetch(self, is_retry=False):
+        url = self.config.get('url')
+        try:
+            resp = self.session.get(url, verify=False)
+            if not resp.ok: 
+                logger.error(f"{self.name} HTTP {resp.status_code}")
+                return []
+            
+            data = resp.json()
+            outages_list = data.get('outages', [])
+            
+            results = []
+            for item in outages_list:
+                results.append(self._normalize(item))
+            return results
+        except Exception as e:
+            logger.error(f"Error fetching {self.name}: {e}")
+            return []
+
+    def _normalize(self, item):
+        # Coordinates
+        x, y = item.get('x'), item.get('y')
+        lat, lon = None, None
+        
+        if x is not None and y is not None and self.transformer:
+            try:
+                # Transform custom projection X/Y to Lon/Lat
+                lon, lat = self.transformer.transform(x, y)
+            except: pass
+
+        # Timestamps (Epoch Milliseconds)
+        start_ts = None
+        time_off = item.get('timeOff')
+        if time_off:
+            try:
+                # Convert ms to seconds
+                start_ts = datetime.fromtimestamp(time_off / 1000, tz=timezone.utc)
+            except: pass
+
+        return {
+            'incidentid': str(item.get('id')),
+            'utility': self.name,
+            'lat': lat,
+            'lon': lon,
+            'pointgeom': f"{lat},{lon}" if lat else None,
+            'areageom': None,
+            'start': start_ts,
+            'etr': None,
+            'outagen': item.get('nbrOut', 1),
+            'cause': "Unknown",
+            'crew_status': "Unknown",
+            'active': True,
+            'last_change': datetime.now(timezone.utc)
+        }
 
 # --- REGISTRY ---
 PROVIDER_REGISTRY = {
     'kubra': KubraProvider,
     'simple_json': SimpleJsonProvider,
-    'gwt_rpc': GwtRpcProvider
+    'gwt_rpc': GwtRpcProvider,
+    'nisc_hosted': NiscHostedProvider,
+    
 }
 
 # --- MAIN ---
diff --git a/providers.json b/providers.json
index b51a148..fadc234 100644
--- a/providers.json
+++ b/providers.json
@@ -217,5 +217,11 @@
             }
         ],
         "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    },
+    {
+        "name": "Buckeye REC",
+        "type": "nisc_hosted",
+        "url": "https://outagemap-data.cloud.coop/buckeyerec/Hosted_Outage_Map/summary.json",
+        "proj_string": "+proj=lcc +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lat_0=38.73333333333333 +lon_0=-82.648 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs"
     }
 ]
\ No newline at end of file