Commit 99ab2ad5 authored by Andrew Hrdy's avatar Andrew Hrdy

Logos now appear on the map (dialog version).

parent 6d12c375
Pipeline #1975 passed with stage
in 1 minute and 39 seconds
......@@ -6,11 +6,6 @@ import MapDialog from './MapDialog';
const mapboxToken = 'pk.eyJ1IjoibWR1ZmZ5OCIsImEiOiJjaXk2a2lxODQwMDdyMnZzYTdyb3M4ZTloIn0.mSocl7zUnZBO6-CV9cvmnA';
const starbucksLogo = new Image();
starbucksLogo.src = require('../images/starbucksSVG.svg');
starbucksLogo.width = 60;
starbucksLogo.height = 60;
const Map = ReactMapboxGl({
accessToken: mapboxToken,
interactive: false,
......
......@@ -91,7 +91,6 @@ class FacilityDialog extends React.Component {
<MapDialog
open={isMapOpen}
facilities={facilities}
facility={facility}
maxBounds={maxBounds}
zoom={mapZoom}
center={mapCenter}
......
......@@ -11,11 +11,6 @@ const Map = ReactMapboxGl({
attributionControl: false
});
const starbucksLogo = new Image();
starbucksLogo.src = require('../images/starbucksSVG.svg');
starbucksLogo.width = 60;
starbucksLogo.height = 60;
class MapDialog extends React.Component {
handleRequestClose = () => {
this.props.onClose(this.props.selectedValue);
......@@ -57,7 +52,9 @@ class MapDialog extends React.Component {
key={item.slug}
coordinates={item.facility_location.coordinate_location.coordinates}
anchor="bottom">
<img height={20} width={20} src={require('../images/starbucksSVG.svg')} />
<img style={{
objectFit: 'contain'
}} height={40} width={40} src={item.logo} />
</Marker>
);
})}
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 237.4 240.3" enable-background="new 0 0 237.4 240.3" xml:space="preserve">
<g>
<path fill="#FFFFFF" d="M237.4,118.7c0,65.6-53.2,118.7-118.7,118.7C53.1,237.4,0,184.2,0,118.7C0,53.1,53.2,0,118.7,0
C184.2,0,237.4,53.1,237.4,118.7"/>
<path fill="#00643C" d="M130.6,51.3c-1-0.2-6-1-11.9-1s-10.9,0.8-11.9,1c-0.6,0.1-0.8-0.5-0.4-0.8c0.4-0.3,12.3-9.4,12.3-9.4
s11.9,9.1,12.3,9.4C131.4,50.8,131.2,51.4,130.6,51.3 M110,110.1c0,0-0.6,0.2-0.8,0.8c2.5,1.9,4.2,6.3,9.4,6.3s6.9-4.4,9.4-6.3
c-0.2-0.6-0.8-0.8-0.8-0.8s-3.3,0.8-8.6,0.8C113.3,110.9,110,110.1,110,110.1 M118.6,102.8c-1.4,0-1.8-0.5-2.7-0.5
s-2.8,0.8-3.2,1.4c0,0.3,0.2,0.6,0.4,0.9c2.1,0.3,3.1,1.5,5.5,1.5s3.4-1.2,5.5-1.5c0.3-0.3,0.4-0.6,0.4-0.9
c-0.4-0.7-2.2-1.4-3.2-1.4C120.4,102.2,120.1,102.8,118.6,102.8 M237.2,125.2c-0.2,2.8-0.4,5.7-0.7,8.4c-13.4,2.2-18.2-9.7-32-9.2
c0.8,2.9,1.5,5.9,2,8.9c11.4,0,15.9,10.6,28.6,9c-0.7,3.2-1.5,6.4-2.4,9.6c-10,1-13.5-8.9-25.1-8.7c0.1,1.7,0.1,3.3,0.1,5
c0,0.9,0,1.9-0.1,2.8c9.9-0.1,13.1,9,22.5,8.6c-1.2,3.2-2.5,6.3-3.9,9.4c-6.8-0.4-9.1-9-19.3-8.3c-0.3,2.2-0.7,4.4-1.2,6.6
c8.9-0.6,10.8,7.6,17.2,8.2c-1.6,3-3.4,5.9-5.2,8.7c-3.8-2-7.1-8.1-14.2-8.5c0.7-2.3,1.4-4.6,1.9-6.9c-6.4,0-13.6-2.5-19.7-8
c2-11.3-15.5-22.7-15.5-31c0-8.9,4.5-13.9,4.5-26c0-9-4.4-18.7-10.9-25.3c-1.3-1.3-2.6-2.3-4.1-3.3c6,7.5,10.7,16.3,10.7,26.6
c0,11.4-5.3,17.4-5.3,27.9s15.4,19.6,15.4,30.4c0,4.3-1.4,8.4-5.8,16.6c6.9,6.9,15.9,10.6,21.7,10.6c1.9,0,2.9-0.6,3.6-2
c0.6-1.3,1.1-2.6,1.6-3.9c6.2,0.2,9.1,5.9,12.5,8.2c-1.9,2.5-3.9,5-6,7.4c-2.3-2.6-5.4-6.9-10-8.1c-0.8,1.6-1.7,3.1-2.6,4.7
c3.9,1.1,6.6,5,8.7,7.6c-2.2,2.3-4.6,4.5-7,6.7c-1.5-2.3-3.9-5.3-6.5-7c-1,1.3-2,2.6-3,3.9c2.3,1.5,4.2,4.3,5.5,6.5
c-2.8,2.3-5.7,4.4-8.7,6.4c-1.5-12.1-17.9-20.3-13.5-34.3c-1.5,2.5-3.2,5.6-3.2,9.3c0,10.1,10.8,18.2,11.6,28.2
c-2.2,1.3-4.5,2.6-6.9,3.8c-0.4-11.1-11.8-23.2-11.8-32.2c0-10.1,13.3-20.3,13.3-32.3s-15.3-20.3-15.3-30.8s6.5-16.5,6.5-30
c0-9.9-4.7-19.8-11.9-26.2c-1.3-1.1-2.5-2-4.1-2.8C156,78.6,160,86,160,97.3c0,12.7-7.5,19.7-7.5,32.1s15,19.3,15,30.8
s-14,21.3-14,33.2c0,10.8,12.3,21.6,12.5,34.4c-2.7,1.2-5.4,2.3-8.2,3.2c1.6-12.9-12.3-26.3-12.3-36.9c0-11.5,14.5-21.5,14.5-33.9
s-14.7-18.2-14.7-31s9.1-19.9,9.1-34c0-11-5.4-20.9-13.4-27c-0.2-0.1-0.3-0.3-0.5-0.4c-0.7-0.6-1.4,0.1-0.8,0.8
c5.6,7,8.6,14.1,8.6,24.6c0,12.9-10.4,23.4-10.4,35.9c0,14.8,14,19,14,31.1s-15,21.8-15,34.7c0,11.9,14.2,25.2,11.7,38.9
c-2.8,0.7-5.7,1.4-8.6,1.9c2.7-17.1-11.2-29.5-11.2-40.7c0-12.1,15.5-23,15.5-34.8c0-11.2-11.1-14.8-12.6-26.3
c-0.2-1.6-1.5-2.7-3.2-2.4c-2.3,0.4-5.2,1.9-9.7,1.9c-4.6,0-7.4-1.5-9.7-1.9c-1.7-0.3-3,0.9-3.2,2.4c-1.5,11.5-12.6,15.1-12.6,26.3
c0,11.9,15.5,22.7,15.5,34.8c0,11.2-13.9,23.5-11.2,40.7c-2.9-0.5-5.8-1.2-8.6-1.9c-2.4-13.8,11.7-27,11.7-38.9
c0-12.9-15-22.6-15-34.7c0-12.1,14-16.3,14-31.1c0-12.5-10.4-23-10.4-35.9c0-10.5,3-17.6,8.6-24.6c0.5-0.7-0.1-1.3-0.8-0.8
c-0.2,0.1-0.3,0.3-0.5,0.4c-7.9,6.1-13.4,16-13.4,27c0,14.1,9.1,21.2,9.1,34c0,12.8-14.7,18.6-14.7,31s14.5,22.4,14.5,33.9
c0,10.6-13.9,23.9-12.3,36.9c-2.8-1-5.5-2-8.2-3.2c0.2-12.8,12.5-23.6,12.5-34.4c0-11.9-14-21.6-14-33.2c0-11.6,15-18.4,15-30.8
c0-12.4-7.5-19.4-7.5-32.1c0-11.3,4-18.7,10.8-26.9c-1.5,0.8-2.8,1.7-4.1,2.8c-7.2,6.4-11.9,16.4-11.9,26.2c0,13.5,6.5,19.5,6.5,30
s-15.3,18.8-15.3,30.8s13.3,22.1,13.3,32.3c0,9.1-11.4,21.2-11.8,32.2c-2.3-1.2-4.6-2.4-6.9-3.8c0.9-10.1,11.7-18.1,11.7-28.2
c0-3.7-1.7-6.8-3.2-9.3c4.4,14-12,22.3-13.5,34.3c-3-2-5.9-4.1-8.7-6.4c1.3-2.2,3.3-5,5.5-6.5c-1-1.3-2.1-2.5-3-3.9
c-2.7,1.6-5,4.6-6.5,7c-2.4-2.1-4.8-4.4-7-6.7c2.1-2.6,4.8-6.6,8.7-7.6c-0.9-1.5-1.8-3.1-2.6-4.7c-4.6,1.2-7.7,5.5-10,8.1
c-2.1-2.4-4.1-4.8-6-7.4c3.5-2.3,6.3-7.9,12.6-8.2c0.5,1.3,1.1,2.6,1.6,3.9c0.7,1.5,1.7,2,3.6,2c5.8,0,14.8-3.8,21.7-10.6
c-4.5-8.2-5.8-12.3-5.8-16.6c0-10.8,15.4-19.9,15.4-30.4s-5.3-16.5-5.3-27.9c0-10.3,4.6-19.1,10.7-26.6c-1.5,0.9-2.8,2-4.1,3.3
c-6.6,6.6-10.9,16.4-10.9,25.3c0,12.1,4.5,17,4.5,26c0,8.3-17.5,19.7-15.5,31c-6.1,5.6-13.4,8-19.8,8c0.6,2.3,1.2,4.6,1.9,6.9
c-7.2,0.4-10.5,6.5-14.2,8.5c-1.9-2.8-3.6-5.7-5.2-8.7c6.4-0.7,8.3-8.9,17.2-8.2c-0.5-2.2-0.9-4.4-1.2-6.6
c-10.3-0.7-12.6,8-19.3,8.3c-1.4-3.1-2.7-6.2-3.9-9.4C17,160,20.2,150.9,30,151c0-0.9,0-1.8,0-2.8c0-1.7,0.1-3.3,0.1-5
c-11.6-0.3-15.1,9.7-25.1,8.7c-0.9-3.1-1.7-6.3-2.4-9.6c12.6,1.6,17.2-9.1,28.6-9c0.5-3,1.2-6,2-8.9c-13.8-0.6-18.6,11.4-32,9.2
c-0.4-2.8-0.6-5.6-0.8-8.4c15.6,1.7,21.5-11.1,35.7-9.5c1.3-3.4,2.9-6.7,4.7-9.9c-17.8-3.1-23.9,11.8-40.5,9.5
C1.7,51.3,54.2,0,118.6,0c64.5,0,116.9,51.3,118.7,115.4c-16.6,2.3-22.7-12.6-40.5-9.5c1.8,3.2,3.3,6.5,4.7,9.9
C215.7,114.1,221.5,127,237.2,125.2 M67.6,75.4c-8.7-3.6-19.3-2.7-28.4,3.1c-1.4-8.4-6-15.9-12.5-20.4c-0.9-0.6-1.8,0-1.8,1
c1.4,17.8-9,33.2-21.8,46.8c13.2,4,24.4-13,41.4-7.1C50.8,89.7,58.6,81.7,67.6,75.4 M118.6,64.7c-11,0-20.3,6.2-22.7,14.3
c-0.2,0.6,0.1,1,0.8,0.7c2-0.9,4.2-1.3,6.7-1.3c4.5,0,8.5,1.7,10.8,4.5c1,3.4,1.1,8.4-0.1,11.2c-1.8-0.4-2.5-1.8-4.3-1.8
s-3.2,1.3-6.3,1.3s-3.4-1.5-5.4-1.5c-2.4,0-2.8,2.4-2.8,5.2c0,12.3,11.3,29.2,23.3,29.2s23.3-16.9,23.3-29.2c0-2.8-0.6-5.1-3-5.4
c-1.2,0.9-2.4,1.7-5.2,1.7c-3.1,0-3.9-1.3-5.7-1.3c-2.2,0-2,4.6-4.6,4.9c-1.7-4.1-1.8-9.5-0.4-14.2c2.3-2.9,6.3-4.5,10.8-4.5
c2.4,0,4.7,0.4,6.7,1.3c0.7,0.3,1-0.1,0.8-0.7C138.9,70.9,129.6,64.7,118.6,64.7 M136.2,82.3c-2.7,0-5.7,0.8-7.7,3
c-0.2,0.6-0.2,1.5,0.1,2c4.8-1.6,9-1.7,11.1,0.6c1.1-1,1.4-1.9,1.4-2.9C141.1,83.4,139.4,82.3,136.2,82.3 M97.6,87.9
c2.3-2.3,7.2-2.2,12.2-0.4c0.2-2.5-4.3-5.3-8.8-5.3c-3.3,0-4.9,1.1-4.9,2.7C96.2,86,96.5,86.9,97.6,87.9 M173.6,46.3
c-8.7,0.6-16.3,3.6-22.4,8.6c2.6-7.4,5.9-13.8,10.1-20c-11.1,1.2-20.3,5.2-27.1,12.2l-5.3-13.9l11.7-10.4l-15.7-1.1l-6.3-14.6
l-6.3,14.6l-15.7,1.1l11.7,10.4L103,47.1c-6.8-6.9-16-11-27.1-12.2c4.2,6.2,7.5,12.7,10.1,20c-6.1-5-13.7-8-22.4-8.6
c5.2,6.7,9.8,13.9,13.3,21.6c0.4,0.9,1.2,1.2,2.1,0.7c11.9-5.9,25.3-9.3,39.6-9.3c14.2,0,27.6,3.3,39.6,9.3
c0.9,0.5,1.7,0.2,2.1-0.7C163.7,60.2,168.4,53,173.6,46.3 M192.6,98.8c17.1-5.9,28.3,11,41.5,7.1c-12.8-13.6-23.2-29-21.8-46.8
c0.1-1-0.9-1.6-1.7-1c-6.5,4.5-11.1,12-12.5,20.4c-9-5.8-19.6-6.6-28.4-3.1C178.7,81.7,186.4,89.7,192.6,98.8"/>
<polygon fill="#00643C" points="190.4,240.3 188.6,240.3 188.6,228.9 184.4,228.9 184.4,227.3 194.7,227.3 194.7,228.9
190.4,228.9 "/>
<polygon fill="#00643C" points="203.2,237.3 203.3,237.3 207.2,227.3 210,227.3 210,240.3 208.2,240.3 208.2,229.4 208.1,229.4
203.8,240.3 202.6,240.3 198.2,229.4 198.2,229.4 198.2,240.3 196.4,240.3 196.4,227.3 199.3,227.3 "/>
</g>
</svg>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment