merge master into dev

Author: avicarie

.env

@@ -3,6 +3,7 @@ API_URL=http://localhost:4000
 GENERATE_API_URL=http://localhost:8000
 PORT=3000
 REACT_APP_CLIENT_ID=7833861618225795
+REACT_APP_LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
 REACT_APP_REDIRECT_URI=http://localhost:3000
 NAMESPACE=hsl-kartta
 
@@ -12,4 +13,4 @@ DIGITRANSIT_APIKEY=
 CYPRESS_TESTING_HSLID_USERNAME=
 CYPRESS_TESTING_HSLID_PASSWORD=
 CYPRESS_HSLID_CLIENT_ID=
-CYPRESS_HSLID_CLIENT_SECRET=
+CYPRESS_HSLID_CLIENT_SECRET=

app/components/RouteMapConfigurator.js

@@ -9,8 +9,13 @@ import AdvancedRouteMapOptions from "../containers/AdvancedRouteMapOptions";
 import {PointStatus} from "../reducers/publisherRequests";
 import {listModalStyles} from "../utils/ui-utils";
 
-// const ZONE_SYMBOLS = [{value: "A"}, {value: "B"}, {value: "C"}, {value: "D"}, {value: "E"}];
-const ZONE_SYMBOLS = [{value: "A"}, {value: "B"}, {value: "C"}, {value: "D"}];
+const ZONE_SYMBOLS = [
+    {value: "A"},
+    {value: "B"},
+    {value: "C"},
+    {value: "D"},
+    {value: "E"}
+];
 
 export default class RouteMapConfigurator extends Component {
     constructor(props) {

app/components/ZoneSymbolMarkers.js

@@ -5,7 +5,7 @@ import AZone from "../icons/icon-Zone-A";
 import BZone from "../icons/icon-Zone-B";
 import CZone from "../icons/icon-Zone-C";
 import DZone from "../icons/icon-Zone-D";
-// import EZone from "../icons/icon-Zone-E";
+import EZone from "../icons/icon-Zone-E";
 import {
     mapSelectionToBbox,
     bboxDiameterInMeters,
@@ -22,8 +22,8 @@ const getZoneIcon = (zone, svgSize) => {
             return <CZone size={svgSize} />;
         case "D":
             return <DZone size={svgSize} />;
-        // case "E":
-        // return <EZone size={svgSize} />;
+        case "E":
+            return <EZone size={svgSize} />;
         default:
             return <div />;
     }

app/components/hsl-zones-publisher-v6.json

@@ -60,6 +60,16 @@
                     [24.543216, 60.11093]
                 ]
             }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "Zone": "E"
+            },
+            "geometry": {
+                "type": "MultiPoint",
+                "coordinates": [[25.02, 60.53]]
+            }
         }
     ]
 }

app/icons/icon-Zone-E.js

@@ -8,24 +8,26 @@ const EZone = (props) => (
             viewBox="0 0 36 36"
             version="1.1"
             xmlns="http://www.w3.org/2000/svg"
-            xlink="http://www.w3.org/1999/xlink">
-            <title>icon-Zone-E</title>
+            xlink="http://www.w3.org/1999/xlink"
+        >
+            <title>icon-Zone-E-v2</title>
             <desc>Created with Sketch.</desc>
             <defs />
             <g
                 id="Page-1"
                 stroke="none"
                 strokeWidth="1"
                 fill="none"
-                fillRule="evenodd">
-                <g id="icon-Zone-E">
+                fillRule="evenodd"
+            >
+                <g id="icon-Zone-E-v2">
                     <path
                         d="M36,18.00096 C36,27.94176 27.9408,36.00096 18,36.00096 C8.0592,36.00096 0,27.94176 0,18.00096 C0,8.05776 8.0592,0.00096 18,0.00096 C27.9408,0.00096 36,8.05776 36,18.00096"
                         id="Fill-1"
                         fill="#007AC9"
                     />
                     <path
-                        d="M9.94704,8.85792 C9.94704,7.78992 10.77024,6.96672 11.83584,6.96672 L17.90304,6.96672 C24.60864,6.96672 29.24064,11.56992 29.24064,17.57472 L29.24064,17.63472 C29.24064,23.63952 24.60864,28.30512 17.90304,28.30512 L11.83584,28.30512 C10.77024,28.30512 9.94704,27.48192 9.94704,26.41152 L9.94704,8.85792 Z M17.90304,24.88992 C22.38384,24.88992 25.30944,21.87312 25.30944,17.69712 L25.30944,17.63472 C25.30944,13.45872 22.38384,10.38192 17.90304,10.38192 L13.69584,10.38192 L13.69584,24.88992 L17.90304,24.88992 Z"
+                        d="M9.94704,8.85792 C9.94704,7.78992 10.77024,6.96672 11.83584,6.96672 L25.07184,6.96672 C26.07744,6.96672 26.87184,7.76112 26.87184,8.76672 C26.87184,9.77232 26.07744,10.56672 25.07184,10.56672 L13.69584,10.56672 L13.69584,16.06272 L23.68464,16.06272 C24.69024,16.06272 25.48464,16.85712 25.48464,17.86272 C25.48464,18.86832 24.69024,19.66272 23.68464,19.66272 L13.69584,19.66272 L13.69584,25.28592 L25.22544,25.28592 C26.23104,25.28592 27.02544,26.08032 27.02544,27.08592 C27.02544,28.09152 26.23104,28.88592 25.22544,28.88592 L11.83584,28.88592 C10.77024,28.88592 9.94704,28.06272 9.94704,26.99472 L9.94704,8.85792 Z"
                         id="Fill-4"
                         fill="#FFFFFF"
                     />