diff --git a/.env b/.env index 2ecc2d2..7676a62 100644 --- a/.env +++ b/.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= \ No newline at end of file +CYPRESS_HSLID_CLIENT_SECRET= diff --git a/app/components/RouteMapConfigurator.js b/app/components/RouteMapConfigurator.js index 479f47d..3d69413 100644 --- a/app/components/RouteMapConfigurator.js +++ b/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) { diff --git a/app/components/ZoneSymbolMarkers.js b/app/components/ZoneSymbolMarkers.js index 453c92f..d1e7aa3 100644 --- a/app/components/ZoneSymbolMarkers.js +++ b/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 ; case "D": return ; - // case "E": - // return ; + case "E": + return ; default: return
; } diff --git a/app/components/hsl-zones-publisher-v6.json b/app/components/hsl-zones-publisher-v6.json index d85a303..9d2bb28 100644 --- a/app/components/hsl-zones-publisher-v6.json +++ b/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]] + } } ] } diff --git a/app/icons/icon-Zone-E.js b/app/icons/icon-Zone-E.js index b2d86c2..67f306d 100644 --- a/app/icons/icon-Zone-E.js +++ b/app/icons/icon-Zone-E.js @@ -8,8 +8,9 @@ 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"> - icon-Zone-E + xlink="http://www.w3.org/1999/xlink" + > + icon-Zone-E-v2 Created with Sketch. ( stroke="none" strokeWidth="1" fill="none" - fillRule="evenodd"> - + fillRule="evenodd" + > +