Merge branch 'master' onto working copy

4 files changed, 19 insertions, 22 deletions

diff --git a/frontend/src/components/app/map/controls/ExportCanvasComponent.js b/frontend/src/components/app/map/controls/ExportCanvasComponent.js
index d166bcc8..8487f47b 100644
--- a/frontend/src/components/app/map/controls/ExportCanvasComponent.js
+++ b/frontend/src/components/app/map/controls/ExportCanvasComponent.js
@@ -6,7 +6,7 @@ const ExportCanvasComponent = () => (
         title="Export Canvas to PNG Image"
         onClick={() => window['exportCanvasToImage']()}
     >
-        <span className="fa fa-camera"/>
+        <span className="fa fa-camera" />
     </button>
 )
 
diff --git a/frontend/src/components/app/map/controls/ScaleIndicatorComponent.js b/frontend/src/components/app/map/controls/ScaleIndicatorComponent.js
index daaf8ec6..54709482 100644
--- a/frontend/src/components/app/map/controls/ScaleIndicatorComponent.js
+++ b/frontend/src/components/app/map/controls/ScaleIndicatorComponent.js
@@ -3,10 +3,7 @@ import { TILE_SIZE_IN_METERS, TILE_SIZE_IN_PIXELS } from '../MapConstants'
 import './ScaleIndicatorComponent.css'
 
 const ScaleIndicatorComponent = ({ scale }) => (
-    <div
-        className="scale-indicator"
-        style={{ width: TILE_SIZE_IN_PIXELS * scale }}
-    >
+    <div className="scale-indicator" style={{ width: TILE_SIZE_IN_PIXELS * scale }}>
         {TILE_SIZE_IN_METERS}m
     </div>
 )
diff --git a/frontend/src/components/app/map/controls/ToolPanelComponent.js b/frontend/src/components/app/map/controls/ToolPanelComponent.js
index e3bb1dbb..e0e4d554 100644
--- a/frontend/src/components/app/map/controls/ToolPanelComponent.js
+++ b/frontend/src/components/app/map/controls/ToolPanelComponent.js
@@ -5,8 +5,8 @@ import './ToolPanelComponent.css'
 
 const ToolPanelComponent = () => (
     <div className="tool-panel">
-        <ZoomControlContainer/>
-        <ExportCanvasComponent/>
+        <ZoomControlContainer />
+        <ExportCanvasComponent />
     </div>
 )
 
diff --git a/frontend/src/components/app/map/controls/ZoomControlComponent.js b/frontend/src/components/app/map/controls/ZoomControlComponent.js
index bd6527a6..65944bea 100644
--- a/frontend/src/components/app/map/controls/ZoomControlComponent.js
+++ b/frontend/src/components/app/map/controls/ZoomControlComponent.js
@@ -3,21 +3,21 @@ import React from 'react'
 const ZoomControlComponent = ({ zoomInOnCenter }) => {
     return (
         <span>
-      <button
-          className="btn btn-default btn-circle btn-sm mr-1"
-          title="Zoom in"
-          onClick={() => zoomInOnCenter(true)}
-      >
-        <span className="fa fa-plus"/>
-      </button>
-      <button
-          className="btn btn-default btn-circle btn-sm mr-1"
-          title="Zoom out"
-          onClick={() => zoomInOnCenter(false)}
-      >
-        <span className="fa fa-minus"/>
-      </button>
-    </span>
+            <button
+                className="btn btn-default btn-circle btn-sm mr-1"
+                title="Zoom in"
+                onClick={() => zoomInOnCenter(true)}
+            >
+                <span className="fa fa-plus" />
+            </button>
+            <button
+                className="btn btn-default btn-circle btn-sm mr-1"
+                title="Zoom out"
+                onClick={() => zoomInOnCenter(false)}
+            >
+                <span className="fa fa-minus" />
+            </button>
+        </span>
     )
 }