From fb4cb64205bc29f6048e771cc2fdd26a32a31bab Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Thu, 20 Jul 2017 08:54:35 -0400 Subject: [PATCH 1/4] #89 Uploaded image files --- static/img/marker/black.png | Bin 0 -> 307 bytes static/img/marker/green.png | Bin 0 -> 843 bytes static/img/marker/grey.png | Bin 0 -> 420 bytes static/img/marker/orange.png | Bin 0 -> 425 bytes static/img/marker/purple.png | Bin 0 -> 425 bytes static/img/marker/red.png | Bin 0 -> 858 bytes static/img/marker/white.png | Bin 0 -> 425 bytes static/img/marker/yellow.png | Bin 0 -> 1420 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/img/marker/black.png create mode 100644 static/img/marker/green.png create mode 100644 static/img/marker/grey.png create mode 100644 static/img/marker/orange.png create mode 100644 static/img/marker/purple.png create mode 100644 static/img/marker/red.png create mode 100644 static/img/marker/white.png create mode 100644 static/img/marker/yellow.png diff --git a/static/img/marker/black.png b/static/img/marker/black.png new file mode 100644 index 0000000000000000000000000000000000000000..36aafb00848c87019dff77daabbe45f6d617f7e5 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^B0#Lf!3-obN;vz0ludw7h%1mL30%E;wV|OwN=oYg z|Nl4ZO)`L*`AdTQf*BOvH_X59Ah18dpg&;!`Ge9)M}bn)JzX3_D&l(2-xg|C5MaL0 zpwls(?alxH*}59a3D)zD^PJ9`up)BDw|y6D%XQZ1c+|xHG1xF8aLshp*2~vb z&$2ULurFOPuWn17n@(-hsmrZq+f*!6%q>Ln&(t}Epom(o zpgNdJt-qMb8>UVFaNRMTSxsy%hvS5cHBnWCcY*Z};>)*G=6&rrQpD;BtTW zez@nJ^E>wnLgJ_b!{7$E72+ls1-pbTgc@7~E2>;28SFZ;v>ItAD0LK(O06WU{R9(0 zn@nZ_uhk{F)H3QI-`#deT%58B0Haf{nuQ ze55%z>y|bpTYFkB1s?TC1?6g%UJ1*L;InhAMowkZvM{)(^;|s*S3)%qjw*8%2&+5Sg;(|VbW`pp
;zs|yA zyv2O?Q!R>z{BvtX5m{IPzU)6+ms;B(-L~_4S@t8e+vK>QL1X*px}~_=En#E#QQ&c} zR9K$R!r;c8q5<#CsP+gCgQ(QwvLNpiDOBB0pg4Lz+cZOwu~!>bpdL9-eBWtn4fnx`hGJG=RS$p*0i29Pkk=gTiDN{|A_B Vt!TsJ=#~Hg002ovPDHLkV1g%nhaCU_ literal 0 HcmV?d00001 diff --git a/static/img/marker/grey.png b/static/img/marker/grey.png new file mode 100644 index 0000000000000000000000000000000000000000..1f4641d8c3dd971fbd2b19caf0407b4f5c59c012 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^B0#Lf!3-obN;vz0R9b*fh%1mL3GCUkr?2lldBcVcJUl$|^78KP?h+CbGiS~$D=V|Mw$|6zZ)|K_x^(Hvl`DgSg5G}H^%rOj ze@T#EFoVK-hx-ll1@{RriGNZ2#T4JGlD_5pEsIIKH#E%FGVSf0=&x$eFKYVzhxpQh>W z@(kJkf6ck>OE04K+5Y@@YJ2jcdQr()2du0@3If^}{L{PrT<+qApF32tyzFj&n6zTv z`Q^pDD*pY&-pwr~HSt+W>sL6pZF%{)B#m^#SMYa(*-dr5<>?IEGZj<@Vp))S|%SvY6?edCt3Y zW&i&xy9XJGyr{Hsy_~7AsqG@<#bHa%)Nd~9)-26f*ZViIVtT2Z)N(E8eiT(iX24Dl-SPTT1FPttEO-uvKS(KE*TD(UL!lioX@3h`oDc4%CJ8cTB99 d8rip2Jicm$%;SPnpVdGC?&<31vd$@?2>=GDnA89O literal 0 HcmV?d00001 diff --git a/static/img/marker/purple.png b/static/img/marker/purple.png new file mode 100644 index 0000000000000000000000000000000000000000..eac5625e56e467eaabeabeab692d0ffea6abae93 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^B0#Lf!3-obN;vz0RAzurh%1mL3FJiYl@`|zbm?m^ zd^4f)Pn6F*2@x$1+q%-EvmQ2eLi`G5y78PG0*$$kbk+QmgV)w&-BppZw>Qn(_Msyg zXcK=)kY6x^!uy8%4)X=}Cm8gv4>*7D<9kb>)B{f!$B>G+-u~m0S`2txqz%;8%XB1O z`uE@cT|{g9rkRKLJ=WeD#WdNZ>0XCg&v;@RRb>GVLubH@b0gUwXC)gccvA_zFq0WqA9w(asEk;BPVjT1Sju}yZJxGFaGJg`iUh| cJ-xPy*GoT;IdRU=&I=Uap00i_>zopr0M{m(;s5{u literal 0 HcmV?d00001 diff --git a/static/img/marker/red.png b/static/img/marker/red.png new file mode 100644 index 0000000000000000000000000000000000000000..d3770dd74a3a88cfbc6c870530c0283bec7fdf5c GIT binary patch literal 858 zcmV-g1Eu_lP)64nq=pa)DvOC(e%Pok4KS#%2QOGzf_1_@zp2K0iM zm1IirS}u*IzJnz+(Rx;-t7egISjho?e`%{1hYo2-5hG>sd$7%)Oa;cZ849vn8b#{v zAnIx->TGkT%S^mBYip(&m6E03K)$DJBY1OIsi41|CZcOTM4sTBdB}C@OqPBCu}g*B zsYr9mY7|!`TfEzLn!Rvd%#4p^X`f3b2cHKjOC71KTIK@RJglx@;gqumf<8(TP7|gE ze&}u|Pqx)l_x`<u&Hdue-c%p)y4Z zuMe_tje0R%~p$ty%QhZhkkm znSNeu5moVVEbL#}DN-<2i)zpFFz`s-CrA~4E;_6G3CKMAIfql%=c>`C7NRSr<%KAO zaaSJ8rom2s6Q=>V84VN~62d~Q5MVrU3=S3|^&U+T%ian>giaP2 zN#CtTN4kY6Ni4h_j4*+VGpetpX-gADgoUxNSO_v+-K{94QN503UqN)R!oh|exzu~0 zn1wHdbqJ#d?+gAM@ti1uhBiGehO%Yx5S{H-v>w7l@Y^X= kt%ooId<5elZl#m|0Vk{&vLebb#Q*>R07*qoM6N<$fmR5azy@G;5LPEm%^XDBL9G*UXx_9$VaKB-`!2X1OgY^OD?Q(uJ0;L{!x;TbZ#O3zi+|;7L((sISl9bEvE<#p z6?;B!V_H$TUC{d4g66|&p9=9}S$1hh zl7e04MR$k7y_*ZVlU8cqlAF8#V%dw2_7<(S0;YZUdLs^Veoy^<;Xr?$={}W!XTr5F zyqIbV{Mq>gY-MA;IR%|A@0%gldsIp&z{|`1k8hV_*NtVblzu+Gc*nDDBI~_V3wKPc em>Su)Ry@9Hh0NoEQ=ip90q*JQ=d#Wzp$PzCDWs+V literal 0 HcmV?d00001 diff --git a/static/img/marker/yellow.png b/static/img/marker/yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..d06c4efded9eee4d8cb8f8b2825d92636c8a2acb GIT binary patch literal 1420 zcmV;71#|j|P)5d!O&iX*Sx!MTMPL9K zH4On_0Y&a>A%Qd%iYyzmJR*-F(@IKH0|7M?MA4E36-30We0qK_!MN%LQBfpjsLNN9aFS&Try0m=-)Mc;c(ou)RD~d%^1#n^gn?nTAjeMRTU0pO+2# z6ApG$QBzYLN&K$UJoCKr!a%(f^{e5sqTn!}>|SnRG)ecozP=`Aqc8z&fOwSKsLsr8NjjN$~@4_QYJoTyK<)X@=k&3ClGjur{x zfD{M23$gE3KHl%jg#DDxjini5eB=9 z@XobtG@hi3VL_szrqf9Pdv+}|rA*$;mUwY)j#q4ir{uo0K#Xc?Dl)1N3y2Jx8!l8= z#jC%hQ349(4zmO#zvF^dGmJUdZ}#ljGXuXDASDHLw1pVpJv$mGtHri9lR5KQ(4Rfb z1gJ#hV9&-{`Dbr2QW+tIO-g5=#>;&c{(Zkx;UKeWtRQxWf&s1WAAG?L2nNd z?0W&h{xS>|i-rZMI7{qio8hAua=8Rq{ZewvVMWBe2rem2X*fV#@w`cSKuNiIX*emt z{&S*XS7o@FP^fylV2dx;0nc4Fw{)aii{JQ-e0=#WTt6LIu~A!CYnS=j&;MFB$5zpZjiu zVS9^YcsTS>W7mHkYo)HPdYg@^Az3l@-_GY1WBvZ*ZV5(&IG_NaXaC1hw!NLX!^2@@ zbTQFGpT*dN0Q!^HxlnAR{~I?N!Yu1UpVlmYqo*^68(rM^y4IXN3KK2M7l*O(AdB(I zy%Ghnp`KzqdvZMr1b|taJQL^{TyM=71zOG|%hB1E0q!o=bu`Yf_eQRq>#R;6li;ES zub|B=({FxjN{7}nDbVs$@+k20sr7O+H6}s*{#bLevM)E&hij`5K^C`tbt}07-&wh2 z{`nu?h0_gd<)FAlE5P=I*w?ne*hm*;9a~4O9O(#=t=ZwmhIP>p;A5J3uUeU)*v~fmgpL?08|@j}@Q z Date: Thu, 20 Jul 2017 08:56:01 -0400 Subject: [PATCH 2/4] #89 Added marker to User schema --- config/models.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/models.js b/config/models.js index fab0b9d..ebaf723 100644 --- a/config/models.js +++ b/config/models.js @@ -32,7 +32,8 @@ const userSchema = new mongoose.Schema({ showSpeed: {type:Boolean, default:false}, showTemp: {type:Boolean, default:false}, showAlt: {type:Boolean, default:false}, - showStreetview: {type:Boolean, default:false} + showStreetview: {type:Boolean, default:false}, + marker: {type:String, default:'red'} }, last: { time: Date, From 1155c08929e25bdc8469009aeba4e54cb2f36edf Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Thu, 20 Jul 2017 09:08:10 -0400 Subject: [PATCH 3/4] #89 Added marker color selection to settings page --- config/routes/settings.js | 3 ++- views/settings.html | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/config/routes/settings.js b/config/routes/settings.js index 97d2b99..3034836 100644 --- a/config/routes/settings.js +++ b/config/routes/settings.js @@ -140,7 +140,8 @@ router.route('/') showScale: (req.body.showScale)?true:false, showSpeed: (req.body.showSpeed)?true:false, showAlt: (req.body.showAlt)?true:false, - showStreetview: (req.body.showStreet)?true:false + showStreetview: (req.body.showStreet)?true:false, + marker: req.body.marker }; // Save user and send response diff --git a/views/settings.html b/views/settings.html index 066db1e..934f324 100644 --- a/views/settings.html +++ b/views/settings.html @@ -60,6 +60,20 @@

+
+ + +
+
@@ -89,7 +103,7 @@
- +