Changeset 335 in tmcsimulator
- Timestamp:
- 03/19/2019 01:17:33 PM (7 years ago)
- Location:
- trunk/webapps
- Files:
-
- 7 edited
-
highway_status.json (modified) (65 diffs)
-
images/icon_cctvCyan.png (modified) (previous)
-
images/icon_cctvWhite.png (modified) (previous)
-
images/icon_cms_active.png (modified) (previous)
-
images/icon_cms_idle.png (modified) (previous)
-
js/cctvLayer.js (modified) (2 diffs)
-
js/cmsLayer.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/webapps/highway_status.json
r329 r335 121 121 }, 122 122 "properties": 123 {"street": "SAND CANYON", "color": " yellow", "perpx": "-0.484045", "perpy": "-0.875043"}123 {"street": "SAND CANYON", "color": "lime", "perpx": "-0.484045", "perpy": "-0.875043"} 124 124 }, 125 125 { … … 132 132 }, 133 133 "properties": 134 {"street": "SAND CANYON", "color": " yellow", "perpx": "0", "perpy": "0"}134 {"street": "SAND CANYON", "color": "lime", "perpx": "0", "perpy": "0"} 135 135 }, 136 136 { … … 143 143 }, 144 144 "properties": 145 {"street": "N OF SAND CANYON", "color": " yellow", "perpx": "0.480131", "perpy": "0.877197"}145 {"street": "N OF SAND CANYON", "color": "lime", "perpx": "0.480131", "perpy": "0.877197"} 146 146 }, 147 147 { … … 154 154 }, 155 155 "properties": 156 {"street": "N OF SAND CANYON", "color": " yellow", "perpx": "-0.484045", "perpy": "-0.875043"}156 {"street": "N OF SAND CANYON", "color": "lime", "perpx": "-0.484045", "perpy": "-0.875043"} 157 157 }, 158 158 { … … 165 165 }, 166 166 "properties": 167 {"street": "JEFFREY 1", "color": " yellow", "perpx": "-0.144931", "perpy": "-0.989442"}167 {"street": "JEFFREY 1", "color": "lime", "perpx": "-0.144931", "perpy": "-0.989442"} 168 168 }, 169 169 { … … 176 176 }, 177 177 "properties": 178 {"street": "JEFFREY 1", "color": " yellow", "perpx": "0.142134", "perpy": "0.989847"}178 {"street": "JEFFREY 1", "color": "lime", "perpx": "0.142134", "perpy": "0.989847"} 179 179 }, 180 180 { … … 187 187 }, 188 188 "properties": 189 {"street": "JEFFREY 2", "color": " red", "perpx": "-0.144931", "perpy": "-0.989442"}189 {"street": "JEFFREY 2", "color": "lime", "perpx": "-0.144931", "perpy": "-0.989442"} 190 190 }, 191 191 { … … 198 198 }, 199 199 "properties": 200 {"street": "JEFFREY 2", "color": " red", "perpx": "0.142134", "perpy": "0.989847"}200 {"street": "JEFFREY 2", "color": "lime", "perpx": "0.142134", "perpy": "0.989847"} 201 201 }, 202 202 { … … 209 209 }, 210 210 "properties": 211 {"street": "YALE", "color": " red", "perpx": "-0.29192", "perpy": "-0.956443"}211 {"street": "YALE", "color": "lime", "perpx": "-0.29192", "perpy": "-0.956443"} 212 212 }, 213 213 { … … 220 220 }, 221 221 "properties": 222 {"street": "YALE", "color": " red", "perpx": "0.267568", "perpy": "0.963539"}222 {"street": "YALE", "color": "lime", "perpx": "0.267568", "perpy": "0.963539"} 223 223 }, 224 224 { … … 231 231 }, 232 232 "properties": 233 {"street": "SPRUCE", "color": " red", "perpx": "-0.29192", "perpy": "-0.956443"}233 {"street": "SPRUCE", "color": "lime", "perpx": "-0.29192", "perpy": "-0.956443"} 234 234 }, 235 235 { … … 242 242 }, 243 243 "properties": 244 {"street": "SPRUCE", "color": " red", "perpx": "0.267568", "perpy": "0.963539"}244 {"street": "SPRUCE", "color": "lime", "perpx": "0.267568", "perpy": "0.963539"} 245 245 }, 246 246 { … … 253 253 }, 254 254 "properties": 255 {"street": "CULVER 1", "color": " red", "perpx": "-0.30889", "perpy": "-0.951098"}255 {"street": "CULVER 1", "color": "lime", "perpx": "-0.30889", "perpy": "-0.951098"} 256 256 }, 257 257 { … … 264 264 }, 265 265 "properties": 266 {"street": "CULVER 1", "color": " red", "perpx": "0.332642", "perpy": "0.943053"}266 {"street": "CULVER 1", "color": "lime", "perpx": "0.332642", "perpy": "0.943053"} 267 267 }, 268 268 { … … 275 275 }, 276 276 "properties": 277 {"street": "CULVER 2", "color": " red", "perpx": "-0.30889", "perpy": "-0.951098"}277 {"street": "CULVER 2", "color": "lime", "perpx": "-0.30889", "perpy": "-0.951098"} 278 278 }, 279 279 { … … 286 286 }, 287 287 "properties": 288 {"street": "CULVER 2", "color": " red", "perpx": "0.320278", "perpy": "0.947323"}288 {"street": "CULVER 2", "color": "lime", "perpx": "0.320278", "perpy": "0.947323"} 289 289 }, 290 290 { … … 297 297 }, 298 298 "properties": 299 {"street": "HARVARD", "color": " red", "perpx": "-0.314462", "perpy": "-0.94927"}299 {"street": "HARVARD", "color": "lime", "perpx": "-0.314462", "perpy": "-0.94927"} 300 300 }, 301 301 { … … 308 308 }, 309 309 "properties": 310 {"street": "HARVARD", "color": " red", "perpx": "0.320278", "perpy": "0.947323"}310 {"street": "HARVARD", "color": "lime", "perpx": "0.320278", "perpy": "0.947323"} 311 311 }, 312 312 { … … 319 319 }, 320 320 "properties": 321 {"street": "JAMBOREE1", "color": " red", "perpx": "-0.402558", "perpy": "-0.915394"}321 {"street": "JAMBOREE1", "color": "lime", "perpx": "-0.402558", "perpy": "-0.915394"} 322 322 }, 323 323 { … … 330 330 }, 331 331 "properties": 332 {"street": "JAMBOREE1", "color": " red", "perpx": "0.400805", "perpy": "0.916164"}332 {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} 333 333 }, 334 334 { … … 341 341 }, 342 342 "properties": 343 {"street": "JAMBOREE2", "color": " red", "perpx": "-0.402558", "perpy": "-0.915394"}343 {"street": "JAMBOREE2", "color": "lime", "perpx": "-0.402558", "perpy": "-0.915394"} 344 344 }, 345 345 { … … 352 352 }, 353 353 "properties": 354 {"street": "JAMBOREE2", "color": " red", "perpx": "0.400805", "perpy": "0.916164"}354 {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} 355 355 }, 356 356 { … … 363 363 }, 364 364 "properties": 365 {"street": "MACARTHUR1", "color": " red", "perpx": "-0.399707", "perpy": "-0.916643"}365 {"street": "MACARTHUR1", "color": "lime", "perpx": "-0.399707", "perpy": "-0.916643"} 366 366 }, 367 367 { … … 374 374 }, 375 375 "properties": 376 {"street": "MACARTHUR 1", "color": " red", "perpx": "0.408917", "perpy": "0.912572"}376 {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"} 377 377 }, 378 378 { … … 385 385 }, 386 386 "properties": 387 {"street": "AIRPORT", "color": " red", "perpx": "-0.358185", "perpy": "-0.933651"}387 {"street": "AIRPORT", "color": "lime", "perpx": "-0.358185", "perpy": "-0.933651"} 388 388 }, 389 389 { … … 396 396 }, 397 397 "properties": 398 {"street": "AIRPORT", "color": " red", "perpx": "0.321527", "perpy": "0.9469"}398 {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"} 399 399 }, 400 400 { … … 407 407 }, 408 408 "properties": 409 {"street": "RED HILL", "color": " red", "perpx": "-0.259554", "perpy": "-0.965729"}409 {"street": "RED HILL", "color": "lime", "perpx": "-0.259554", "perpy": "-0.965729"} 410 410 }, 411 411 { … … 418 418 }, 419 419 "properties": 420 {"street": "RED HILL", "color": " red", "perpx": "0.126754", "perpy": "0.991934"}420 {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"} 421 421 }, 422 422 { … … 1079 1079 }, 1080 1080 "properties": 1081 {"street": "OSO PARK2", "color": " yellow", "perpx": "-0.999911", "perpy": "0.013321"}1081 {"street": "OSO PARK2", "color": "lime", "perpx": "-0.999911", "perpy": "0.013321"} 1082 1082 }, 1083 1083 { … … 1090 1090 }, 1091 1091 "properties": 1092 {"street": "OSO PARK2", "color": " yellow", "perpx": "0", "perpy": "0"}1092 {"street": "OSO PARK2", "color": "lime", "perpx": "0", "perpy": "0"} 1093 1093 }, 1094 1094 { … … 1101 1101 }, 1102 1102 "properties": 1103 {"street": "LA PAZ 1", "color": " yellow", "perpx": "-0.688838", "perpy": "-0.724915"}1103 {"street": "LA PAZ 1", "color": "lime", "perpx": "-0.688838", "perpy": "-0.724915"} 1104 1104 }, 1105 1105 { … … 1112 1112 }, 1113 1113 "properties": 1114 {"street": "LA PAZ 2", "color": " yellow", "perpx": "-0.688838", "perpy": "-0.724915"}1114 {"street": "LA PAZ 2", "color": "lime", "perpx": "-0.688838", "perpy": "-0.724915"} 1115 1115 }, 1116 1116 { … … 1123 1123 }, 1124 1124 "properties": 1125 {"street": "LA PAZ 1", "color": " yellow", "perpx": "0", "perpy": "0"}1125 {"street": "LA PAZ 1", "color": "lime", "perpx": "0", "perpy": "0"} 1126 1126 }, 1127 1127 { … … 1134 1134 }, 1135 1135 "properties": 1136 {"street": "LA PAZ 2", "color": " yellow", "perpx": "0", "perpy": "0"}1136 {"street": "LA PAZ 2", "color": "lime", "perpx": "0", "perpy": "0"} 1137 1137 }, 1138 1138 { … … 1145 1145 }, 1146 1146 "properties": 1147 {"street": "ALICIA 1", "color": " yellow", "perpx": "0", "perpy": "0"}1147 {"street": "ALICIA 1", "color": "lime", "perpx": "0", "perpy": "0"} 1148 1148 }, 1149 1149 { … … 1156 1156 }, 1157 1157 "properties": 1158 {"street": "ALICIA 1", "color": " yellow", "perpx": "0", "perpy": "0"}1158 {"street": "ALICIA 1", "color": "lime", "perpx": "0", "perpy": "0"} 1159 1159 }, 1160 1160 { … … 1167 1167 }, 1168 1168 "properties": 1169 {"street": "ALICIA 2", "color": " yellow", "perpx": "-0.527137", "perpy": "-0.849781"}1169 {"street": "ALICIA 2", "color": "lime", "perpx": "-0.527137", "perpy": "-0.849781"} 1170 1170 }, 1171 1171 { … … 1178 1178 }, 1179 1179 "properties": 1180 {"street": "ALICIA 2", "color": " red", "perpx": "0", "perpy": "0"}1180 {"street": "ALICIA 2", "color": "lime", "perpx": "0", "perpy": "0"} 1181 1181 }, 1182 1182 { … … 1189 1189 }, 1190 1190 "properties": 1191 {"street": "EL TORO 1", "color": " red", "perpx": "-0.647397", "perpy": "-0.762153"}1191 {"street": "EL TORO 1", "color": "lime", "perpx": "-0.647397", "perpy": "-0.762153"} 1192 1192 }, 1193 1193 { … … 1200 1200 }, 1201 1201 "properties": 1202 {"street": "EL TORO 1", "color": " red", "perpx": "0.647648", "perpy": "0.761939"}1202 {"street": "EL TORO 1", "color": "lime", "perpx": "0.647648", "perpy": "0.761939"} 1203 1203 }, 1204 1204 { … … 1211 1211 }, 1212 1212 "properties": 1213 {"street": "EL TORO 2", "color": " red", "perpx": "-0.647397", "perpy": "-0.762153"}1213 {"street": "EL TORO 2", "color": "lime", "perpx": "-0.647397", "perpy": "-0.762153"} 1214 1214 }, 1215 1215 { … … 1222 1222 }, 1223 1223 "properties": 1224 {"street": "LAKE FOR1", "color": " red", "perpx": "0", "perpy": "0"}1224 {"street": "LAKE FOR1", "color": "lime", "perpx": "0", "perpy": "0"} 1225 1225 }, 1226 1226 { … … 1233 1233 }, 1234 1234 "properties": 1235 {"street": "LAKE FOR2", "color": " red", "perpx": "0", "perpy": "0"}1235 {"street": "LAKE FOR2", "color": "lime", "perpx": "0", "perpy": "0"} 1236 1236 }, 1237 1237 { … … 1244 1244 }, 1245 1245 "properties": 1246 {"street": "LAKE FOR2", "color": " red", "perpx": "0", "perpy": "0"}1246 {"street": "LAKE FOR2", "color": "lime", "perpx": "0", "perpy": "0"} 1247 1247 }, 1248 1248 { … … 1783 1783 }, 1784 1784 "properties": 1785 {"street": "N OF 55", "color": " yellow", "perpx": "0.333225", "perpy": "0.942847"}1785 {"street": "N OF 55", "color": "lime", "perpx": "0.333225", "perpy": "0.942847"} 1786 1786 }, 1787 1787 { … … 1794 1794 }, 1795 1795 "properties": 1796 {"street": "N OF 55", "color": " yellow", "perpx": "-0.33389", "perpy": "-0.942612"}1796 {"street": "N OF 55", "color": "lime", "perpx": "-0.33389", "perpy": "-0.942612"} 1797 1797 }, 1798 1798 { … … 2314 2314 }, 2315 2315 "properties": 2316 {"street": "PAULARINO 1", "color": " yellow", "perpx": "0.73612", "perpy": "-0.676851"}2316 {"street": "PAULARINO 1", "color": "lime", "perpx": "0.73612", "perpy": "-0.676851"} 2317 2317 }, 2318 2318 { … … 2325 2325 }, 2326 2326 "properties": 2327 {"street": "PAULARINO 1", "color": " yellow", "perpx": "-0.722093", "perpy": "0.691796"}2327 {"street": "PAULARINO 1", "color": "lime", "perpx": "-0.722093", "perpy": "0.691796"} 2328 2328 }, 2329 2329 { … … 2336 2336 }, 2337 2337 "properties": 2338 {"street": "PAULARINO 2", "color": " yellow", "perpx": "0.719864", "perpy": "-0.694115"}2338 {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"} 2339 2339 }, 2340 2340 { … … 2347 2347 }, 2348 2348 "properties": 2349 {"street": "PAULARINO 2", "color": " yellow", "perpx": "-0.725185", "perpy": "0.688554"}2349 {"street": "PAULARINO 2", "color": "lime", "perpx": "-0.725185", "perpy": "0.688554"} 2350 2350 }, 2351 2351 { … … 2358 2358 }, 2359 2359 "properties": 2360 {"street": "MACARTHU1", "color": " red", "perpx": "-0.710326", "perpy": "0.703873"}2360 {"street": "MACARTHU1", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} 2361 2361 }, 2362 2362 { … … 2369 2369 }, 2370 2370 "properties": 2371 {"street": "MACARTHU1", "color": " red", "perpx": "0.740557", "perpy": "-0.671994"}2371 {"street": "MACARTHU1", "color": "yellow", "perpx": "0.740557", "perpy": "-0.671994"} 2372 2372 }, 2373 2373 { … … 2380 2380 }, 2381 2381 "properties": 2382 {"street": "MACARTHU2", "color": " red", "perpx": "-0.710326", "perpy": "0.703873"}2382 {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} 2383 2383 }, 2384 2384 { … … 2391 2391 }, 2392 2392 "properties": 2393 {"street": "MACARTHU2", "color": " red", "perpx": "0", "perpy": "0"}2393 {"street": "MACARTHU2", "color": "lime", "perpx": "0", "perpy": "0"} 2394 2394 }, 2395 2395 { … … 2402 2402 }, 2403 2403 "properties": 2404 {"street": "DYER 1", "color": " red", "perpx": "0", "perpy": "0"}2404 {"street": "DYER 1", "color": "lime", "perpx": "0", "perpy": "0"} 2405 2405 }, 2406 2406 { … … 2413 2413 }, 2414 2414 "properties": 2415 {"street": "DYER 2", "color": " red", "perpx": "0.71172", "perpy": "-0.702463"}2415 {"street": "DYER 2", "color": "lime", "perpx": "0.71172", "perpy": "-0.702463"} 2416 2416 }, 2417 2417 { … … 2424 2424 }, 2425 2425 "properties": 2426 {"street": "DYER 2", "color": " red", "perpx": "-0.708914", "perpy": "0.705295"}2426 {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"} 2427 2427 }, 2428 2428 { … … 2435 2435 }, 2436 2436 "properties": 2437 {"street": "EDINGER 1", "color": " red", "perpx": "0", "perpy": "0"}2437 {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"} 2438 2438 }, 2439 2439 { … … 2446 2446 }, 2447 2447 "properties": 2448 {"street": "EDINGER 2", "color": " yellow", "perpx": "0", "perpy": "0"}2448 {"street": "EDINGER 2", "color": "lime", "perpx": "0", "perpy": "0"} 2449 2449 }, 2450 2450 { … … 2457 2457 }, 2458 2458 "properties": 2459 {"street": "MCFADDEN", "color": " yellow", "perpx": "-0.999946", "perpy": "-0.010425"}2459 {"street": "MCFADDEN", "color": "lime", "perpx": "-0.999946", "perpy": "-0.010425"} 2460 2460 }, 2461 2461 { … … 2468 2468 }, 2469 2469 "properties": 2470 {"street": "MCFADDEN", "color": " yellow", "perpx": "0.999932", "perpy": "-0.011627"}2470 {"street": "MCFADDEN", "color": "lime", "perpx": "0.999932", "perpy": "-0.011627"} 2471 2471 }, 2472 2472 { … … 2490 2490 }, 2491 2491 "properties": 2492 {"street": "S OF 5", "color": " yellow", "perpx": "-0.999756", "perpy": "0.022109"}2492 {"street": "S OF 5", "color": "lime", "perpx": "-0.999756", "perpy": "0.022109"} 2493 2493 }, 2494 2494 { … … 2501 2501 }, 2502 2502 "properties": 2503 {"street": "S OF 5", "color": " yellow", "perpx": "0.999923", "perpy": "0.012439"}2503 {"street": "S OF 5", "color": "lime", "perpx": "0.999923", "perpy": "0.012439"} 2504 2504 }, 2505 2505 { … … 2512 2512 }, 2513 2513 "properties": 2514 {"street": "N OF 5", "color": " yellow", "perpx": "-0.987616", "perpy": "0.156888"}2514 {"street": "N OF 5", "color": "lime", "perpx": "-0.987616", "perpy": "0.156888"} 2515 2515 }, 2516 2516 { … … 2523 2523 }, 2524 2524 "properties": 2525 {"street": "N OF 5", "color": " yellow", "perpx": "0.97478", "perpy": "-0.22317"}2525 {"street": "N OF 5", "color": "lime", "perpx": "0.97478", "perpy": "-0.22317"} 2526 2526 }, 2527 2527 { -
trunk/webapps/js/cctvLayer.js
r326 r335 43 43 cctvLayer = new google.maps.Data(); 44 44 cctvLayer.loadGeoJson(kCCTVfile); 45 // Define the clickable area on an icon (the default is too big) 46 var clickRegion = {coords: [0,0,14,8], type: "rect"} 45 47 cctvLayer.setStyle(function(feature) 46 48 { … … 48 50 return { 49 51 icon: makecctvIcon(feature.getProperty("nearVDS")), 52 shape: clickRegion, 50 53 title: feature.getId() + " " +feature.getProperty('locationName'), 51 54 visible: false -
trunk/webapps/js/cmsLayer.js
r334 r335 34 34 cmsLayer = new google.maps.Data(); 35 35 cmsLayer.setMap(map); 36 cmsLayer.loadGeoJson(kCMSfile); 36 cmsLayer.loadGeoJson(kCMSfile); 37 // Define the clickable area on a CMS icon (the default is too big) 38 var clickRegion = {coords: [0,0,18,15], type: "rect"} 37 39 cmsLayer.setStyle(function(feature) 38 { 39 // return the StyleOptions 40 return { 41 icon: iconCMSidle, 42 title: feature.getId()+ " " +feature.getProperty("location")+ " " 43 + feature.getProperty("street"), 44 visible: false 45 }; 46 }); 40 { 41 // return the StyleOptions 42 return { 43 icon: iconCMSidle, 44 shape: clickRegion, 45 title: feature.getId()+ " " +feature.getProperty("location")+ " " 46 + feature.getProperty("street"), 47 visible: false 48 }; 49 }); 47 50 48 51 cmsLayer.addListener('click', function(event)
Note: See TracChangeset
for help on using the changeset viewer.
