Skip to content

Revert zone e stuff #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avicarie merged 1 commit into from
Apr 21, 2026
Merged

Revert zone e stuff #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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=
9 changes: 2 additions & 7 deletions app/components/RouteMapConfigurator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions app/components/ZoneSymbolMarkers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 />;
}
Expand Down
10 changes: 0 additions & 10 deletions app/components/hsl-zones-publisher-v6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@
[24.543216, 60.11093]
]
}
},
{
"type": "Feature",
"properties": {
"Zone": "E"
},
"geometry": {
"type": "MultiPoint",
"coordinates": [[25.02, 60.53]]
}
}
]
}
12 changes: 5 additions & 7 deletions app/icons/icon-Zone-E.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,24 @@ 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-v2</title>
xlink="http://www.w3.org/1999/xlink">
<title>icon-Zone-E</title>
<desc>Created with Sketch.</desc>
<defs />
<g
id="Page-1"
stroke="none"
strokeWidth="1"
fill="none"
fillRule="evenodd"
>
<g id="icon-Zone-E-v2">
fillRule="evenodd">
<g id="icon-Zone-E">
<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 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"
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"
id="Fill-4"
fill="#FFFFFF"
/>
Expand Down
52 changes: 26 additions & 26 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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"

Expand Down
Loading