Skip to content

Commit cac59a4

Browse files
AmiyaSXAmiyaSX
committed
Fix booth positions and labels
1 parent 7686109 commit cac59a4

File tree

6 files changed

+133
-71
lines changed

6 files changed

+133
-71
lines changed

‎public/map_icons/startup.png

4.64 KB
Loading

‎src/app/student/map/data/booths.json

+106-64
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"properties": {
113113
"id": 32,
114114
"location": "nymble/2",
115-
"exhibitorId": 1524
115+
"exhibitorId": 1590
116116
},
117117
"geometry": {
118118
"coordinates": [
@@ -175,7 +175,7 @@
175175
"properties": {
176176
"id": 35,
177177
"location": "nymble/2",
178-
"exhibitorId": 1590
178+
"exhibitorId": 1524
179179
},
180180
"geometry": {
181181
"coordinates": [
@@ -400,27 +400,6 @@
400400
"type": "Polygon"
401401
}
402402
},
403-
{
404-
"id": 48,
405-
"type": "Feature",
406-
"properties": {
407-
"id": 48,
408-
"location": "nymble/2",
409-
"exhibitorId": 1487
410-
},
411-
"geometry": {
412-
"coordinates": [
413-
[
414-
[18.070603683430306, 59.3472623523424],
415-
[18.070645737835235, 59.34727624464375],
416-
[18.070667817921787, 59.34725935264041],
417-
[18.07062534902451, 59.34724524753841],
418-
[18.070603683430306, 59.3472623523424]
419-
]
420-
],
421-
"type": "Polygon"
422-
}
423-
},
424403
{
425404
"id": 49,
426405
"type": "Feature",
@@ -432,11 +411,11 @@
432411
"geometry": {
433412
"coordinates": [
434413
[
435-
[18.070646141705737, 59.34727618536243],
436-
[18.070686940191678, 59.34728977072399],
437-
[18.07071039950401, 59.34727339749281],
438-
[18.070668329675584, 59.347259436550814],
439-
[18.070646141705737, 59.34727618536243]
414+
[18.07062989277054, 59.347270662509004],
415+
[18.07067069125648, 59.34728424787056],
416+
[18.070693326132158, 59.34726779057368],
417+
[18.070652080740388, 59.34725391369739],
418+
[18.07062989277054, 59.347270662509004]
440419
]
441420
],
442421
"type": "Polygon"
@@ -469,7 +448,7 @@
469448
"properties": {
470449
"id": 51,
471450
"location": "nymble/2",
472-
"exhibitorId": 1555
451+
"exhibitorId": 1487
473452
},
474453
"geometry": {
475454
"coordinates": [
@@ -789,11 +768,11 @@
789768
"geometry": {
790769
"coordinates": [
791770
[
792-
[18.070644291377675, 59.34729907217397],
793-
[18.07059525520171, 59.34728312103951],
794-
[18.07061781644481, 59.34726743768326],
795-
[18.0706669031388, 59.34728355765816],
796-
[18.070644291377675, 59.34729907217397]
771+
[18.070650169668113, 59.347301778895115],
772+
[18.07061570821037, 59.34729042237609],
773+
[18.070638169289623, 59.34727439683613],
774+
[18.07067336242531, 59.34728591879852],
775+
[18.070650169668113, 59.347301778895115]
797776
]
798777
],
799778
"type": "Polygon"
@@ -999,11 +978,11 @@
999978
"geometry": {
1000979
"coordinates": [
1001980
[
1002-
[18.070309559441995, 59.347305940273486],
1003-
[18.070343973268052, 59.34728930691935],
1004-
[18.070293935400684, 59.34726341318],
1005-
[18.070259004538542, 59.34728050531035],
1006-
[18.070309559441995, 59.347305940273486]
981+
[18.070299870862755, 59.347299536951084],
982+
[18.070334284688812, 59.34728290359695],
983+
[18.070284246821444, 59.3472570098576],
984+
[18.070249315959302, 59.34727410198795],
985+
[18.070299870862755, 59.347299536951084]
1007986
]
1008987
],
1009988
"type": "Polygon"
@@ -1020,11 +999,11 @@
1020999
"geometry": {
10211000
"coordinates": [
10221001
[
1023-
[18.07027426743838, 59.34732311214046],
1024-
[18.070309570194922, 59.34730592962498],
1025-
[18.070258902884063, 59.34728051922781],
1026-
[18.07022534722202, 59.34729744033541],
1027-
[18.07027426743838, 59.34732311214046]
1002+
[18.07026454267725, 59.347316635410635],
1003+
[18.070299845433794, 59.34729945289516],
1004+
[18.070249178122936, 59.347274042497986],
1005+
[18.070215622460893, 59.34729096360559],
1006+
[18.07026454267725, 59.347316635410635]
10281007
]
10291008
],
10301009
"type": "Polygon"
@@ -2301,11 +2280,11 @@
23012280
"geometry": {
23022281
"coordinates": [
23032282
[
2304-
[18.07157217325343, 59.34811724310683],
2305-
[18.07156065379536, 59.348091153391124],
2306-
[18.07160381163493, 59.34808625228709],
2307-
[18.07161472984714, 59.34811246682298],
2308-
[18.07157217325343, 59.34811724310683]
2283+
[18.071576968023805, 59.34812151088934],
2284+
[18.071566465701977, 59.348097806546036],
2285+
[18.071609623541548, 59.348092905442],
2286+
[18.071619570020317, 59.34811676331407],
2287+
[18.071576968023805, 59.34812151088934]
23092288
]
23102289
],
23112290
"type": "Polygon"
@@ -2322,11 +2301,11 @@
23222301
"geometry": {
23232302
"coordinates": [
23242303
[
2325-
[18.071574012287755, 59.34808968874475],
2326-
[18.071564103088207, 59.34806971847385],
2327-
[18.07162541021617, 59.348061722760605],
2328-
[18.071634936072087, 59.34808227519326],
2329-
[18.071574012287755, 59.34808968874475]
2304+
[18.071610074461347, 59.34809260878603],
2305+
[18.071598106015585, 59.348067527356136],
2306+
[18.07164025647532, 59.34806246710119],
2307+
[18.071651813774707, 59.34808762867556],
2308+
[18.071610074461347, 59.34809260878603]
23302309
]
23312310
],
23322311
"type": "Polygon"
@@ -2343,11 +2322,11 @@
23432322
"geometry": {
23442323
"coordinates": [
23452324
[
2346-
[18.07161469136588, 59.34811248307426],
2347-
[18.07165561203493, 59.34810796351917],
2348-
[18.071645656224945, 59.348081008856354],
2349-
[18.07160390767939, 59.348085985062056],
2350-
[18.07161469136588, 59.34811248307426]
2325+
[18.071619775242482, 59.348116681692545],
2326+
[18.07166096922029, 59.348111594894135],
2327+
[18.071651623692304, 59.34808780344332],
2328+
[18.07160987514675, 59.34809277964902],
2329+
[18.071619775242482, 59.348116681692545]
23512330
]
23522331
],
23532332
"type": "Polygon"
@@ -2511,11 +2490,11 @@
25112490
"geometry": {
25122491
"coordinates": [
25132492
[
2514-
[18.070545843265762, 59.347267161600826],
2515-
[18.070595067707075, 59.34728322008746],
2516-
[18.07061762592008, 59.34726742687704],
2517-
[18.07056919479234, 59.34725149539676],
2518-
[18.070545843265762, 59.347267161600826]
2493+
[18.0705777350216, 59.34727814334386],
2494+
[18.07061571017792, 59.347290476172816],
2495+
[18.070638160154346, 59.34727437013717],
2496+
[18.07060057126469, 59.34726174399793],
2497+
[18.0705777350216, 59.34727814334386]
25192498
]
25202499
],
25212500
"type": "Polygon"
@@ -2541,6 +2520,69 @@
25412520
],
25422521
"type": "Polygon"
25432522
}
2523+
},
2524+
{
2525+
"id": 166,
2526+
"type": "Feature",
2527+
"properties": {
2528+
"id": 166,
2529+
"location": "nymble/2",
2530+
"exhibitorId": 1545
2531+
},
2532+
"geometry": {
2533+
"coordinates": [
2534+
[
2535+
[18.070314374441978, 59.34733703358887],
2536+
[18.070360209813714, 59.34731416261371],
2537+
[18.0703329351648, 59.34729861034211],
2538+
[18.07028628115981, 59.34732166429538],
2539+
[18.070314374441978, 59.34733703358887]
2540+
]
2541+
],
2542+
"type": "Polygon"
2543+
}
2544+
},
2545+
{
2546+
"id": 167,
2547+
"type": "Feature",
2548+
"properties": {
2549+
"id": 167,
2550+
"location": "nymble/2",
2551+
"exhibitorId": 1555
2552+
},
2553+
"geometry": {
2554+
"coordinates": [
2555+
[
2556+
[18.070577776242374, 59.347278163210945],
2557+
[18.070600571457646, 59.347261732524174],
2558+
[18.07056327990415, 59.34724963692278],
2559+
[18.07053957829507, 59.34726591013637],
2560+
[18.070577776242374, 59.347278163210945]
2561+
]
2562+
],
2563+
"type": "Polygon"
2564+
}
2565+
},
2566+
{
2567+
"id": 168,
2568+
"type": "Feature",
2569+
"properties": {
2570+
"id": 168,
2571+
"location": "library",
2572+
"exhibitorId": 1638
2573+
},
2574+
"geometry": {
2575+
"coordinates": [
2576+
[
2577+
[18.071566649991894, 59.34809760531596],
2578+
[18.07160982096704, 59.348092740668704],
2579+
[18.071598068222414, 59.348067527546135],
2580+
[18.071555129974143, 59.34807340072231],
2581+
[18.071566649991894, 59.34809760531596]
2582+
]
2583+
],
2584+
"type": "Polygon"
2585+
}
25442586
}
25452587
]
25462588
}

‎src/app/student/map/data/nymble.plan2.routes.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
[18.0705060363941, 59.3472666010876],
4545
[18.0703691720102, 59.3472042429081],
4646
[18.0702823047917, 59.3472485307412],
47-
[18.0701954375732, 59.3472928185744],
48-
[18.0702798572654, 59.3473386559583],
49-
[18.0703707806626, 59.3472932286464],
47+
[18.0702032446519, 59.3472897441877],
48+
[18.0702707549943, 59.3473253233648],
49+
[18.0703481568565, 59.3472863832737],
5050
[18.0703047913742, 59.3472595120782],
51-
[18.0702822702433, 59.3472484401217]
51+
[18.0702828916855, 59.3472483640108]
5252
]
5353
},
5454
"id": "84a8f014-635a-4dc4-97b0-00fbf8e4754c",

‎src/app/student/map/data/nymble.plan3.json

+11
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,17 @@
961961
"pointType": "Exit"
962962
}
963963
},
964+
{
965+
"type": "Feature",
966+
"geometry": {
967+
"type": "Point",
968+
"coordinates": [18.0706162227062, 59.3473913156493]
969+
},
970+
"id": "d9fc8fe0-a883-4ba6-bf0d-d0cf0eb2109c",
971+
"properties": {
972+
"pointType": "StartUp"
973+
}
974+
},
964975
{
965976
"type": "Feature",
966977
"geometry": {

‎src/app/student/map/data/nymble.plan3.rooms.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"type": "Polygon",
6464
"coordinates": [
6565
[
66-
[18.070733018168, 59.3473107161555],
66+
[18.0707331318445, 59.34731063284],
6767
[18.0708098262436, 59.3473340636232],
6868
[18.0706893440628, 59.3474033406784],
6969
[18.0706720326238, 59.3474109264896],
@@ -86,7 +86,11 @@
8686
[18.0703948237239, 59.3474351586535],
8787
[18.070438691685, 59.347419076346],
8888
[18.0704735055337, 59.347445429803],
89-
[18.070733018168, 59.3473107161555]
89+
[18.070505944613, 59.3474285905971],
90+
[18.0705470045807, 59.3474495899601],
91+
[18.0707339115286, 59.347351314644],
92+
[18.0706926671607, 59.3473314634178],
93+
[18.0707331318445, 59.34731063284]
9094
]
9195
]
9296
},

‎src/app/student/map/lib/config.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ export enum PointType {
7070
Door = "Door",
7171
WC = "WC",
7272
Stair = "Stair",
73-
Disability = "Disability"
73+
Disability = "Disability",
74+
StartUp = "StartUp"
7475
}
7576

7677
// Function to add icon assets after map is loaded
@@ -90,12 +91,14 @@ export async function addMapIconAssets(
9091
const wcIcon = await loadImage("/map_icons/wc.png")
9192
const stairIcon = await loadImage("/map_icons/stair.png")
9293
const disabilityIcon = await loadImage("/map_icons/disability.png")
94+
const startUpIcon = await loadImage("/map_icons/startup.png")
9395

9496
map.addImage("exit-icon", exitIcon)
9597
map.addImage("door-icon", doorIcon)
9698
map.addImage("wc-icon", wcIcon)
9799
map.addImage("stair-icon", stairIcon)
98100
map.addImage("disability-icon", disabilityIcon)
101+
map.addImage("startup-icon", startUpIcon)
99102
} catch (error) {
100103
console.error("Error loading icons:", error)
101104
}
@@ -221,6 +224,8 @@ export const symbolLayerStyle: SymbolLayer = {
221224
"stair-icon",
222225
["==", ["get", "pointType"], PointType.Disability],
223226
"disability-icon",
227+
["==", ["get", "pointType"], PointType.StartUp],
228+
"startup-icon",
224229
"default" // fallback icon
225230
],
226231
"icon-size": 0.6, // Adjust icon size

0 commit comments

Comments
 (0)