From 4493750a63fbc08097d8970ff3e5a8bbd6a44d5c Mon Sep 17 00:00:00 2001
From: Stephen More <stephen.more@gmail.com>
Date: Sun, 14 Dec 2014 13:52:49 +0000
Subject: [PATCH] Can now act as a drop In replacement for
 http://ojw.dev.openstreetmap.org/StaticMap/

---
 images/markers/bullseye.png | Bin 0 -> 1250 bytes
 staticmap.php               |  36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 images/markers/bullseye.png

diff --git a/images/markers/bullseye.png b/images/markers/bullseye.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ff1c23899f93b193f57986d4c680587470467ab
GIT binary patch
literal 1250
zcmV<81ReW{P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700006VoOIv0RI60
z0RN!9r;`8x1eZxfK~z|U&DmRsRb><h@ZYy*j+LlnVML};DosXF5M7{p$Y-G_yV@8t
zXPSzxkZ4db(48)#nKC+Klou?Eh#n&!GKe0sC`!$WOuOIE!g6%Z?qQ!9&U|yunSExQ
z=nwPot@Z!b_n$p`uWzk2!6?y9OA}WFE=@TLGcl#?K7elnJ4$Rz*xJsn(VP<+A+KXb
zN=Hg7PHXV2uL7G&tm$CiQ5Cq3X(b-RB1~vdSd6}ubtN9^<kv9^T+0oC7cg~<!eac6
z+lp+dN2)3CRhss*EO1wy{fDtV@OjE!94y->%HGMjI3I;NF_!J){w_+n1$NPVDjRTJ
zji9@*5}S(Ilc<RvPQZ=08*^&VHcw&Uwe*iD@Ku@)Wa6%`66gmk*~iAN8ozNZl;bYM
zlQ=o{r)(^8b0DoNu!rYyXO%Oy^wZJF{zinwc#-4#S%U?!FR-GWduj?Se-N9ZeQ97x
zJ5P^ASd6tS4LlxeNLkRqYr_PVQ^_vT*P8M`NA_nq>L`nRA~OG0;LJt*21$jGM`Lk#
zWxT{eIri(3`NYFKGO$P(ydiFhh(GqzIbPxh&__q$=g8dF%PE5bOWZ2DAyO8P^@GTR
zJNN@jBJ(jR#X*6%DI$FF-SCfP+^{!GYhOm@g^+a9g3}}C@~#H++*r`Xk-&<`Jg1vk
z%}rbpISylUBM0;_Tb92rkR{p=vAj6^snkSZbINmQ9<U|MO9Gch+z&^(zADkn)%aAF
z+%Lu@xHILGUara;r;T6maU}Y(B<1XgyEAXl9%h$Vk7HwB;JB0x-OS1x4?8LsDRUFd
zh)CZy5b&PBadrF?o9b6XF@~HSI4!}Xh;&eXT$qD%Q3LV*jMkHrs<i(R68sg}Cg$Co
z@<9$-9?k$JN9#Wm!{51?d83tBuKp`=Fd3fT>LG5#zDe*|WSpBfT4&a&wc?-Hm-2UD
zVH;mJAh0D`??_VKi;U;L#EE$$wrADIIcZktzF+=X9yqt1H}b|=%}KKUWe_RbniICB
zL%D^%tlWPgZ}9Ssad%#RH59l3O_BNS06lz#Gb$Xrr*KxaCT2X)l{INQ4NdA_6ge}2
zz{Y6LoN|NnpI|ySN8+Seg)>+Wu0db4@5xn1zgZuKRZI;$6`B7@=p7W;!M>Dr5$WU!
zbdRUFlu*coOp9DS?R-Bd5Sn;cxlyUWg0(CiFM&NQ3BxO%UkY?p=*sXW2j{aVa7`sU
zFmFDG-Wr~cMvas(g9k&_sKsq(Ya81u&L4`ktf(=M+0sX6xrZ1vRxx!#_Bvfz#r;f?
z#g&FyqmP$m^OP7r1(r@`eWNL;D@!G<vQ{&G=kkv}DuS(7eLe%bv7(>NBhC0$b5en8
zaj)9N>!vBR<{BPVh)ho98QfRr{3C&nO6&+((J@dNO-h*=vU~kJ6@5k(0nfIvIDT>?
z3LHRBHso2Yf%`cpeoeW(at>1sBNnX1Y^v2F6B#G-(clnP7HAns91RZ9Ut;<ZifMKY
z&TdfHZfq#fyNK`dZfZziCCa_<JY25Izadig$hx$5OT5#W6(kMgUv3XBL6VH^%>V!Z
M07*qoM6N<$f*l1;<p2Nx

literal 0
HcmV?d00001

diff --git a/staticmap.php b/staticmap.php
index 720452f..232594f 100644
--- a/staticmap.php
+++ b/staticmap.php
@@ -65,8 +65,12 @@ Class staticMapLite
             'shadow' => '../marker_shadow.png',
             'offsetImage' => '-10,-32',
             'offsetShadow' => '-1,-13'
+        ),
+        // http://svn.openstreetmap.org/sites/other/StaticMap/symbols/0.png
+        'ojw' => array('regex' => '/^bullseye$/',
+            'extension' => '.png',
+            'shadow' => false 
         )
-
     );
 
 
@@ -97,6 +101,16 @@ Class staticMapLite
     {
         global $_GET;
 
+        if (!empty($_GET['show'])) {
+           $this->parseOjwParams();
+        }
+        else {
+           $this->parseLiteParams();
+        }
+    }
+
+    public function parseLiteParams()
+    {
         // get zoom from GET paramter
         $this->zoom = $_GET['zoom'] ? intval($_GET['zoom']) : 0;
         if ($this->zoom > 18) $this->zoom = 18;
@@ -130,6 +144,24 @@ Class staticMapLite
         }
     }
 
+    public function parseOjwParams()
+    {
+        $this->lat = floatval($_GET['lat']);
+        $this->lon = floatval($_GET['lon']);
+        $this->zoom = intval($_GET['z']);
+
+        $this->width = intval($_GET['w']);
+        $this->height = intval($_GET['h']);
+
+	if (!empty($_GET['mlat0'])) {
+            $markerLat = floatval($_GET['mlat0']);
+            if (!empty($_GET['mlon0'])) {
+                $markerLon = floatval($_GET['mlon0']);
+                $this->markers[] = array('lat' => $markerLat, 'lon' => $markerLon, 'type' => "bullseye");
+            }
+        }
+    }
+
     public function lonToTile($long, $zoom)
     {
         return (($long + 180) / 360) * pow(2, $zoom);
@@ -369,4 +401,4 @@ Class staticMapLite
 }
 
 $map = new staticMapLite();
-print $map->showMap();
\ No newline at end of file
+print $map->showMap();