From 5e9e6896c060fa2d5cc8e95dcde859608faf59f2 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Fri, 23 Feb 2018 17:02:54 +0100
Subject: [PATCH] Fire icon sizes

---
 designs/icons-tcef.svg                     |   6 +++---
 imports/ui/components/Maps/FireIconMark.js |  15 +++++++++++++--
 imports/ui/components/Maps/Icons.js        |  18 ++++++++++++++++++
 public/fire-marker-l.png                   | Bin 0 -> 720 bytes
 public/fire-marker-m.png                   | Bin 0 -> 542 bytes
 public/fire-marker-s.png                   | Bin 0 -> 399 bytes
 6 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 public/fire-marker-l.png
 create mode 100644 public/fire-marker-m.png
 create mode 100644 public/fire-marker-s.png

diff --git a/designs/icons-tcef.svg b/designs/icons-tcef.svg
index fd3a447..8bfd7f1 100644
--- a/designs/icons-tcef.svg
+++ b/designs/icons-tcef.svg
@@ -338,9 +338,9 @@
     <g
        id="g22554"
        transform="translate(103.16604,61.471991)"
-       inkscape:export-filename="/mnt/md1/proyectos/dev/todos-contra-el-fuego-web/public/fire-marker.png"
-       inkscape:export-xdpi="4.0856881"
-       inkscape:export-ydpi="4.0856881">
+       inkscape:export-filename="/mnt/md1/proyectos/dev/todos-contra-el-fuego-web/public/fire-marker-s.png"
+       inkscape:export-xdpi="2"
+       inkscape:export-ydpi="2">
       <path
          style="fill:#d41300;fill-opacity:1;stroke:none;stroke-width:10.58333302;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m -25.638382,38.048346 c 11.566313,13.887908 17.1215844,22.244854 13.751242,33.868326 -2.465387,8.50265 -8.895424,18.626534 -18.100172,25.532106 -9.204776,6.905572 -20.549951,13.517692 -24.263404,17.728802 -3.71348,4.21108 -9.835779,11.6046 -10.976769,21.82688 -2.725208,24.7073 15.038044,45.63926 39.702238,48.35952 11.289242,1.2311 26.6324564,-5.2645 34.2331684,-10.31973 C 16.308659,169.98901 28.520768,152.76263 31.570884,138.81099 35.854436,119.21732 35.065926,96.385127 23.626002,79.16853 12.946123,63.095807 3.8673424,50.775037 -25.638382,38.048346 Z"
diff --git a/imports/ui/components/Maps/FireIconMark.js b/imports/ui/components/Maps/FireIconMark.js
index 9817666..9de93b2 100644
--- a/imports/ui/components/Maps/FireIconMark.js
+++ b/imports/ui/components/Maps/FireIconMark.js
@@ -2,7 +2,7 @@
 import React, { Component, Fragment } from 'react';
 import { CircleMarker, Marker, Tooltip } from 'react-leaflet';
 import PropTypes from 'prop-types';
-import { fireIcon, nFireIcon, industryIcon } from '/imports/ui/components/Maps/Icons';
+import { fireIconS, fireIconM, fireIconL, nFireIcon, industryIcon } from '/imports/ui/components/Maps/Icons';
 import { translate } from 'react-i18next';
 import FirePopup from './FirePopup';
 
@@ -18,10 +18,20 @@ class FireIconMark extends Component {
     this.props.history.push(`/fire/${this.props.nasa ? 'active' : 'alert'}/${this.props.id}`);
   }
 
+  // Some docs:
+  // https://earthdata.nasa.gov/what-is-new-collection-6-modis-active-fire-data
+  // https://cdn.earthdata.nasa.gov/conduit/upload/3865/MODIS_C6_Fire_User_Guide_A.pdf
+  getIcon(scan) {
+    if (scan <= 1) return fireIconS;
+    if (scan <= 2) return fireIconM;
+    return fireIconL;
+  }
+
   render() {
     const {
       lat,
       lon,
+      scan,
       nasa,
       id,
       history,
@@ -32,7 +42,7 @@ class FireIconMark extends Component {
     return (
       <div>
         { !falsePositives &&
-          <Marker position={[lat, lon]} icon={nasa ? fireIcon : nFireIcon} onClick={this.onClick} >
+          <Marker position={[lat, lon]} icon={nasa ? this.getIcon(scan) : nFireIcon} onClick={this.onClick} >
             <FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} />
           </Marker> }
         { falsePositives &&
@@ -54,6 +64,7 @@ FireIconMark.propTypes = {
   // https://github.com/PaulLeCam/react-leaflet/tree/master/src/propTypes
   lat: PropTypes.number.isRequired,
   lon: PropTypes.number.isRequired,
+  scan: PropTypes.number,
   nasa: PropTypes.bool,
   falsePositives: PropTypes.bool.isRequired,
   id: PropTypes.object.isRequired,
diff --git a/imports/ui/components/Maps/Icons.js b/imports/ui/components/Maps/Icons.js
index 2c04886..7b9ecdb 100644
--- a/imports/ui/components/Maps/Icons.js
+++ b/imports/ui/components/Maps/Icons.js
@@ -12,6 +12,24 @@ export const fireIcon = new Leaflet.Icon({
    * popupAnchor:  [-3, -76]// point from which the popup should open relative to the iconAnchor */
 });
 
+export const fireIconL = new Leaflet.Icon({
+  iconUrl: '/fire-marker-l.png',
+  iconSize: [16, 24],
+  iconAnchor: [8, 26]
+});
+
+export const fireIconM = new Leaflet.Icon({
+  iconUrl: '/fire-marker-m.png',
+  iconSize: [12, 17],
+  iconAnchor: [6, 19]
+});
+
+export const fireIconS = new Leaflet.Icon({
+  iconUrl: '/fire-marker-s.png',
+  iconSize: [8, 12],
+  iconAnchor: [4, 14]
+});
+
 export const industryIcon = new Leaflet.Icon({
   iconUrl: '/industry-marker.png',
   iconSize: [32, 37],
diff --git a/public/fire-marker-l.png b/public/fire-marker-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a20859bd5b6ccf70d71556b7a8b9b0b0b9957da
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq000mG000;W1^@s6^PqhU00004b3#c}2nYxW
zd<bNS00009a7bBm0001?0001?0gpLZM*si-8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10!>LoK~y-6jg(JFR8bVhfA`MQ8Ar*Pd1K-bRJaf{X{D1)wvDJw
zPzn7RDyXQ9ZE7JwEyINnE&2mdYi$uh1VJt`R7wPW?}`221f`{5kmES|PK$JydCi;V
ztnNAA`M&d=dwCCh!rDr+9pm!oHfsEO0JI;_KF=qBEg9ZhCMU~@_{JavY?DdbL~N6X
z6A8i<I{-Ka>%fDJ^mHi8u+u<Y#R32b9}BXixICVKs)_|fv(r=BABuCWVgW6rOStND
zOgjH7;KVp8&{YC5T(||G{K!*rS^~m25b^5~Ar&Y&*`!m!3m{(3p;pWltstPS7`*}`
zK;ve;db{@?^U;xaFcYU~KEyMnxBwJ6tLf+>+?is<p7ILRYJlk|?XEC^qPx@>$z(_j
z+#{S!d7+SY8mJ3shJb{h&qz-iRUITTa36Hh)`oUndIefa5tU)kaP>No<7WT}wzLvX
z?k#LtG&J;xhZu-NsXuapX!<;%*7hPSoJ_Gi_G&ZzU<fo9HpI?eqVYyQI$T?F9V1ro
zvI@%p+`RgpZklf1_U>5}YYRW}XK@+Q!0cur(vvPr23Q^+`Ade$U5kuqgr|8&!C+Z(
z_T3E2Z^r=8a7BUW)oSjd_z94CGwMs0T#j#jz2LeixYM@4a2~Yc9JEbVou;6y%vj<L
zcWq6+UOXimzqXfOb`bh!f)nL{ZSsA#Eg?%!24(%%lDOHd{2qTTpAYR5+hoOw(eEV}
zea_SMM76;=fx}9vR#j!>WHo02&({qe?Ve-aJNOS{{>NJJ8t=aV0000<MNUMnLSTXn
C^*eq5

literal 0
HcmV?d00001

diff --git a/public/fire-marker-m.png b/public/fire-marker-m.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6325f00f107ff9555da085e1090767348c1e4f9
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000aC000pP1^@s6={-%N00004b3#c}2nYxW
zd<bNS00009a7bBm0001X0001X0Zw}+2mk;88FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h>ugK~yM_jge1C6k!;~f8V#Q>*gP1W-iH=vKi7!;btbZ6d`!u
zlj6~f-4dchNaqL--GUTv;tC-iJ4qcPDFPSVnTa*JNx_z*2)oqM_;%Q4UB_MMxqZ){
z_kF(agAiUp#4&j2THFY0E#X>RuuVMM<i%Ek_<x0Li|4k9*arE}U6=u{TP6e#0L8H1
z#_KNw#99Ufw7^sYb*p;7LM`6}j>UZuUN&+He62`DnslE=SOmhF7Etv{`5t;~gGGcK
z&;}42OohAN(EtU5+tCO+C}taVYwq#skRquZgOn&f0-dM!cXc!H-ofAh!PoH-5CN!Y
zU?FUd58tGJW0Poag7#}^&W~jRsiZ}5H#l`?C%OD~o8;yv;_1=)fY{(r?Fxc>u0C~S
zjEhTapwE7d@BOURgmtap13*XSUQ_dNrA+zV8-QIrRyFVpkl#i3j2WQx^a=jqK~;pA
zA*cdSFnQou>W{awECKvVS-#KDiDPo;nq*I2_8)AMQBgdKU%fsNz0?=`Rmc~s-}Z9t
g$1Gj(I0}4!0ZUzmJ!*|3C;$Ke07*qoM6N<$f)=pqAOHXW

literal 0
HcmV?d00001

diff --git a/public/fire-marker-s.png b/public/fire-marker-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..954e689873640c23b19cd2d09c5077af603c3594
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^96-#&!3HGb=lz)rq*#ibJVQ8upoSx*1IXtr@Q5r1
z(*7XKnB4XEI*=h*;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6axbzkEe@c
zh{V*=3AWyc6GU3)tLRSUyZX%6Ri%TKTPdjE^@TjA3kMzV$jGpi|8H2`F?;p9rrpgy
zm_@kCUd-lN>uTMxV|(4P@4Hk~`R09`S8Zo8!6_nT?b;hp>^W}SS}IyKC$@n(VY$4H
zLBto=8?m1(`tnzH2pK26V6Jp9FqzZxW~YeK4wh4$3sVD2lAe08Tz4?FHt(N1`#?_{
z!@9eHYq}n?tzbw=ul;lR^N|X!wHaBhEtmUvwwXW4{-B|xwD;GhjHBLc5d~b6r>xIA
z87g+X)p*@;b(7o$v)7ycoAB&!Z+{uLwBL&<5%0tPzDPF_5fn6ZoA>>@i+0~JuD3!q
qEL(S9KivF&`Pv6@+GQ&DUWjKD#b?}f-YEwRJO)o!KbLh*2~7a$ji9>#

literal 0
HcmV?d00001