diff --git a/.env b/.env index 7676a62..2ecc2d2 100644 --- a/.env +++ b/.env @@ -3,7 +3,6 @@ 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 @@ -13,4 +12,4 @@ DIGITRANSIT_APIKEY= CYPRESS_TESTING_HSLID_USERNAME= CYPRESS_TESTING_HSLID_PASSWORD= CYPRESS_HSLID_CLIENT_ID= -CYPRESS_HSLID_CLIENT_SECRET= +CYPRESS_HSLID_CLIENT_SECRET= \ No newline at end of file diff --git a/app/components/RouteMapConfigurator.js b/app/components/RouteMapConfigurator.js index 3d69413..479f47d 100644 --- a/app/components/RouteMapConfigurator.js +++ b/app/components/RouteMapConfigurator.js @@ -9,13 +9,8 @@ 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"}, {value: "E"}]; +const ZONE_SYMBOLS = [{value: "A"}, {value: "B"}, {value: "C"}, {value: "D"}]; export default class RouteMapConfigurator extends Component { constructor(props) { diff --git a/app/components/ZoneSymbolMarkers.js b/app/components/ZoneSymbolMarkers.js index d1e7aa3..453c92f 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 9d2bb28..d85a303 100644 --- a/app/components/hsl-zones-publisher-v6.json +++ b/app/components/hsl-zones-publisher-v6.json @@ -60,16 +60,6 @@ [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 67f306d..b2d86c2 100644 --- a/app/icons/icon-Zone-E.js +++ b/app/icons/icon-Zone-E.js @@ -8,9 +8,8 @@ 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-v2 + xlink="http://www.w3.org/1999/xlink"> + icon-Zone-E Created with Sketch. ( stroke="none" strokeWidth="1" fill="none" - fillRule="evenodd" - > - + fillRule="evenodd"> + diff --git a/yarn.lock b/yarn.lock index bdf93e4..9547ebb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2079,12 +2079,12 @@ asn1@~0.2.3: safer-buffer "~2.1.0" asn1js@^3.0.6: - version "3.0.7" - resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.7.tgz#15f1f2f59e60f80d5b43ef14047a294a969f824f" - integrity sha512-uLvq6KJu04qoQM6gvBfKFjlh6Gl0vOKQuR5cJMDHQkmwfMOQeN3F3SHCv9SNYSL+CRoHvOGFfllDlVz03GQjvQ== + version "3.0.10" + resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.10.tgz#df26c874c8a8b41ca605efea47b2ad07551013dd" + integrity sha512-S2s3aOytiKdFRdulw2qPE51MzjzVOisppcVv7jVFR+Kw0kxwvFrDcYA0h7Ndqbmj0HkMIXYWaoj7fli8kgx1eg== dependencies: pvtsutils "^1.3.6" - pvutils "^1.1.3" + pvutils "^1.1.5" tslib "^2.8.1" assert-plus@1.0.0, assert-plus@^1.0.0: @@ -2205,9 +2205,9 @@ base64-js@^1.3.1: integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== baseline-browser-mapping@^2.10.12: - version "2.10.19" - resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.19.tgz#7697721c22f94f66195d0c34299b1a91e3299493" - integrity sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g== + version "2.10.20" + resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.20.tgz#7c99b86d43ae9be3810cac515f4675802e1f6b87" + integrity sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ== batch@0.6.1: version "0.6.1" @@ -4224,9 +4224,9 @@ hasha@5.2.2: type-fest "^0.8.0" hasown@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + version "2.0.3" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.3.tgz#5e5c2b15b60370a4c7930c383dfb76bf17bc403c" + integrity sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg== dependencies: function-bind "^1.1.2" @@ -4261,9 +4261,9 @@ hpack.js@^2.1.6: hsl-map-style@hsldevcom/hsl-map-style#master: version "1.2.3" - resolved "https://codeload.github.com/hsldevcom/hsl-map-style/tar.gz/2e247924dde50d3e229ab5cb2650d0d2a56ff66e" + resolved "https://codeload.github.com/hsldevcom/hsl-map-style/tar.gz/5ae387b5c5e6946b62c752f029c6b361a4c28753" dependencies: - lodash "^4.17.4" + lodash "^4.18.1" html-minifier-terser@^6.0.2: version "6.1.0" @@ -4279,9 +4279,9 @@ html-minifier-terser@^6.0.2: terser "^5.10.0" html-webpack-plugin@^5: - version "5.6.6" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.6.tgz#5321b9579f4a1949318550ced99c2a4a4e60cbaf" - integrity sha512-bLjW01UTrvoWTJQL5LsMRo1SypHW80FTm12OJRSnr3v6YHNhfe+1r0MYUZJMACxnCHURVnBWRwAsWs2yPU9Ezw== + version "5.6.7" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.7.tgz#429bab4e12abf3c07e1c608886608e2df2c06b11" + integrity sha512-md+vXtdCAe60s1k6AU3dUyMJnDxUyQAwfwPKoLisvgUF1IXjtlLsk2se54+qfL9Mdm26bbwvjJybpNx48NKRLw== dependencies: "@types/html-minifier-terser" "^6.0.0" html-minifier-terser "^6.0.2" @@ -4902,9 +4902,9 @@ json5@^2.2.3: integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^6.0.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62" - integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg== + version "6.2.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.1.tgz#b6e31717f22cc37330b081ce0051ed5de53af2f6" + integrity sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q== dependencies: universalify "^2.0.0" optionalDependencies: @@ -5169,7 +5169,7 @@ lodash.restparam@^3.0.0: resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw== -lodash@4.18.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.23, lodash@^4.17.4, lodash@^4.18.1: +lodash@4.18.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.23, lodash@^4.18.1: version "4.18.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c" integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q== @@ -6087,7 +6087,7 @@ pvtsutils@^1.3.6: dependencies: tslib "^2.8.1" -pvutils@^1.1.3: +pvutils@^1.1.3, pvutils@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.5.tgz#84b0dea4a5d670249aa9800511804ee0b7c2809c" integrity sha512-KTqnxsgGiQ6ZAzZCVlJH5eOjSnvlyEgx1m8bkRJfOhmGRqfo5KLvmAlACQkrjEtOQ4B7wF9TdSLIs9O90MX9xA== @@ -6602,13 +6602,13 @@ rxjs@^7.5.1: tslib "^2.1.0" safe-array-concat@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3" - integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q== + version "1.1.4" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.4.tgz#a54cc9b61a57f33b42abad3cbdda3a2b38cc5719" + integrity sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg== dependencies: - call-bind "^1.0.8" - call-bound "^1.0.2" - get-intrinsic "^1.2.6" + call-bind "^1.0.9" + call-bound "^1.0.4" + get-intrinsic "^1.3.0" has-symbols "^1.1.0" isarray "^2.0.5"