Index: /trunk/webapps/highway_status.json =================================================================== --- /trunk/webapps/highway_status.json (revision 329) +++ /trunk/webapps/highway_status.json (revision 335) @@ -121,5 +121,5 @@ }, "properties": - {"street": "SAND CANYON", "color": "yellow", "perpx": "-0.484045", "perpy": "-0.875043"} + {"street": "SAND CANYON", "color": "lime", "perpx": "-0.484045", "perpy": "-0.875043"} }, { @@ -132,5 +132,5 @@ }, "properties": - {"street": "SAND CANYON", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "SAND CANYON", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -143,5 +143,5 @@ }, "properties": - {"street": "N OF SAND CANYON", "color": "yellow", "perpx": "0.480131", "perpy": "0.877197"} + {"street": "N OF SAND CANYON", "color": "lime", "perpx": "0.480131", "perpy": "0.877197"} }, { @@ -154,5 +154,5 @@ }, "properties": - {"street": "N OF SAND CANYON", "color": "yellow", "perpx": "-0.484045", "perpy": "-0.875043"} + {"street": "N OF SAND CANYON", "color": "lime", "perpx": "-0.484045", "perpy": "-0.875043"} }, { @@ -165,5 +165,5 @@ }, "properties": - {"street": "JEFFREY 1", "color": "yellow", "perpx": "-0.144931", "perpy": "-0.989442"} + {"street": "JEFFREY 1", "color": "lime", "perpx": "-0.144931", "perpy": "-0.989442"} }, { @@ -176,5 +176,5 @@ }, "properties": - {"street": "JEFFREY 1", "color": "yellow", "perpx": "0.142134", "perpy": "0.989847"} + {"street": "JEFFREY 1", "color": "lime", "perpx": "0.142134", "perpy": "0.989847"} }, { @@ -187,5 +187,5 @@ }, "properties": - {"street": "JEFFREY 2", "color": "red", "perpx": "-0.144931", "perpy": "-0.989442"} + {"street": "JEFFREY 2", "color": "lime", "perpx": "-0.144931", "perpy": "-0.989442"} }, { @@ -198,5 +198,5 @@ }, "properties": - {"street": "JEFFREY 2", "color": "red", "perpx": "0.142134", "perpy": "0.989847"} + {"street": "JEFFREY 2", "color": "lime", "perpx": "0.142134", "perpy": "0.989847"} }, { @@ -209,5 +209,5 @@ }, "properties": - {"street": "YALE", "color": "red", "perpx": "-0.29192", "perpy": "-0.956443"} + {"street": "YALE", "color": "lime", "perpx": "-0.29192", "perpy": "-0.956443"} }, { @@ -220,5 +220,5 @@ }, "properties": - {"street": "YALE", "color": "red", "perpx": "0.267568", "perpy": "0.963539"} + {"street": "YALE", "color": "lime", "perpx": "0.267568", "perpy": "0.963539"} }, { @@ -231,5 +231,5 @@ }, "properties": - {"street": "SPRUCE", "color": "red", "perpx": "-0.29192", "perpy": "-0.956443"} + {"street": "SPRUCE", "color": "lime", "perpx": "-0.29192", "perpy": "-0.956443"} }, { @@ -242,5 +242,5 @@ }, "properties": - {"street": "SPRUCE", "color": "red", "perpx": "0.267568", "perpy": "0.963539"} + {"street": "SPRUCE", "color": "lime", "perpx": "0.267568", "perpy": "0.963539"} }, { @@ -253,5 +253,5 @@ }, "properties": - {"street": "CULVER 1", "color": "red", "perpx": "-0.30889", "perpy": "-0.951098"} + {"street": "CULVER 1", "color": "lime", "perpx": "-0.30889", "perpy": "-0.951098"} }, { @@ -264,5 +264,5 @@ }, "properties": - {"street": "CULVER 1", "color": "red", "perpx": "0.332642", "perpy": "0.943053"} + {"street": "CULVER 1", "color": "lime", "perpx": "0.332642", "perpy": "0.943053"} }, { @@ -275,5 +275,5 @@ }, "properties": - {"street": "CULVER 2", "color": "red", "perpx": "-0.30889", "perpy": "-0.951098"} + {"street": "CULVER 2", "color": "lime", "perpx": "-0.30889", "perpy": "-0.951098"} }, { @@ -286,5 +286,5 @@ }, "properties": - {"street": "CULVER 2", "color": "red", "perpx": "0.320278", "perpy": "0.947323"} + {"street": "CULVER 2", "color": "lime", "perpx": "0.320278", "perpy": "0.947323"} }, { @@ -297,5 +297,5 @@ }, "properties": - {"street": "HARVARD", "color": "red", "perpx": "-0.314462", "perpy": "-0.94927"} + {"street": "HARVARD", "color": "lime", "perpx": "-0.314462", "perpy": "-0.94927"} }, { @@ -308,5 +308,5 @@ }, "properties": - {"street": "HARVARD", "color": "red", "perpx": "0.320278", "perpy": "0.947323"} + {"street": "HARVARD", "color": "lime", "perpx": "0.320278", "perpy": "0.947323"} }, { @@ -319,5 +319,5 @@ }, "properties": - {"street": "JAMBOREE1", "color": "red", "perpx": "-0.402558", "perpy": "-0.915394"} + {"street": "JAMBOREE1", "color": "lime", "perpx": "-0.402558", "perpy": "-0.915394"} }, { @@ -330,5 +330,5 @@ }, "properties": - {"street": "JAMBOREE1", "color": "red", "perpx": "0.400805", "perpy": "0.916164"} + {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} }, { @@ -341,5 +341,5 @@ }, "properties": - {"street": "JAMBOREE2", "color": "red", "perpx": "-0.402558", "perpy": "-0.915394"} + {"street": "JAMBOREE2", "color": "lime", "perpx": "-0.402558", "perpy": "-0.915394"} }, { @@ -352,5 +352,5 @@ }, "properties": - {"street": "JAMBOREE2", "color": "red", "perpx": "0.400805", "perpy": "0.916164"} + {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} }, { @@ -363,5 +363,5 @@ }, "properties": - {"street": "MACARTHUR1", "color": "red", "perpx": "-0.399707", "perpy": "-0.916643"} + {"street": "MACARTHUR1", "color": "lime", "perpx": "-0.399707", "perpy": "-0.916643"} }, { @@ -374,5 +374,5 @@ }, "properties": - {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"} + {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"} }, { @@ -385,5 +385,5 @@ }, "properties": - {"street": "AIRPORT", "color": "red", "perpx": "-0.358185", "perpy": "-0.933651"} + {"street": "AIRPORT", "color": "lime", "perpx": "-0.358185", "perpy": "-0.933651"} }, { @@ -396,5 +396,5 @@ }, "properties": - {"street": "AIRPORT", "color": "red", "perpx": "0.321527", "perpy": "0.9469"} + {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"} }, { @@ -407,5 +407,5 @@ }, "properties": - {"street": "RED HILL", "color": "red", "perpx": "-0.259554", "perpy": "-0.965729"} + {"street": "RED HILL", "color": "lime", "perpx": "-0.259554", "perpy": "-0.965729"} }, { @@ -418,5 +418,5 @@ }, "properties": - {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"} + {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"} }, { @@ -1079,5 +1079,5 @@ }, "properties": - {"street": "OSO PARK2", "color": "yellow", "perpx": "-0.999911", "perpy": "0.013321"} + {"street": "OSO PARK2", "color": "lime", "perpx": "-0.999911", "perpy": "0.013321"} }, { @@ -1090,5 +1090,5 @@ }, "properties": - {"street": "OSO PARK2", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "OSO PARK2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1101,5 +1101,5 @@ }, "properties": - {"street": "LA PAZ 1", "color": "yellow", "perpx": "-0.688838", "perpy": "-0.724915"} + {"street": "LA PAZ 1", "color": "lime", "perpx": "-0.688838", "perpy": "-0.724915"} }, { @@ -1112,5 +1112,5 @@ }, "properties": - {"street": "LA PAZ 2", "color": "yellow", "perpx": "-0.688838", "perpy": "-0.724915"} + {"street": "LA PAZ 2", "color": "lime", "perpx": "-0.688838", "perpy": "-0.724915"} }, { @@ -1123,5 +1123,5 @@ }, "properties": - {"street": "LA PAZ 1", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "LA PAZ 1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1134,5 +1134,5 @@ }, "properties": - {"street": "LA PAZ 2", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "LA PAZ 2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1145,5 +1145,5 @@ }, "properties": - {"street": "ALICIA 1", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "ALICIA 1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1156,5 +1156,5 @@ }, "properties": - {"street": "ALICIA 1", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "ALICIA 1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1167,5 +1167,5 @@ }, "properties": - {"street": "ALICIA 2", "color": "yellow", "perpx": "-0.527137", "perpy": "-0.849781"} + {"street": "ALICIA 2", "color": "lime", "perpx": "-0.527137", "perpy": "-0.849781"} }, { @@ -1178,5 +1178,5 @@ }, "properties": - {"street": "ALICIA 2", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "ALICIA 2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1189,5 +1189,5 @@ }, "properties": - {"street": "EL TORO 1", "color": "red", "perpx": "-0.647397", "perpy": "-0.762153"} + {"street": "EL TORO 1", "color": "lime", "perpx": "-0.647397", "perpy": "-0.762153"} }, { @@ -1200,5 +1200,5 @@ }, "properties": - {"street": "EL TORO 1", "color": "red", "perpx": "0.647648", "perpy": "0.761939"} + {"street": "EL TORO 1", "color": "lime", "perpx": "0.647648", "perpy": "0.761939"} }, { @@ -1211,5 +1211,5 @@ }, "properties": - {"street": "EL TORO 2", "color": "red", "perpx": "-0.647397", "perpy": "-0.762153"} + {"street": "EL TORO 2", "color": "lime", "perpx": "-0.647397", "perpy": "-0.762153"} }, { @@ -1222,5 +1222,5 @@ }, "properties": - {"street": "LAKE FOR1", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "LAKE FOR1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1233,5 +1233,5 @@ }, "properties": - {"street": "LAKE FOR2", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "LAKE FOR2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1244,5 +1244,5 @@ }, "properties": - {"street": "LAKE FOR2", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "LAKE FOR2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -1783,5 +1783,5 @@ }, "properties": - {"street": "N OF 55", "color": "yellow", "perpx": "0.333225", "perpy": "0.942847"} + {"street": "N OF 55", "color": "lime", "perpx": "0.333225", "perpy": "0.942847"} }, { @@ -1794,5 +1794,5 @@ }, "properties": - {"street": "N OF 55", "color": "yellow", "perpx": "-0.33389", "perpy": "-0.942612"} + {"street": "N OF 55", "color": "lime", "perpx": "-0.33389", "perpy": "-0.942612"} }, { @@ -2314,5 +2314,5 @@ }, "properties": - {"street": "PAULARINO 1", "color": "yellow", "perpx": "0.73612", "perpy": "-0.676851"} + {"street": "PAULARINO 1", "color": "lime", "perpx": "0.73612", "perpy": "-0.676851"} }, { @@ -2325,5 +2325,5 @@ }, "properties": - {"street": "PAULARINO 1", "color": "yellow", "perpx": "-0.722093", "perpy": "0.691796"} + {"street": "PAULARINO 1", "color": "lime", "perpx": "-0.722093", "perpy": "0.691796"} }, { @@ -2336,5 +2336,5 @@ }, "properties": - {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"} + {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"} }, { @@ -2347,5 +2347,5 @@ }, "properties": - {"street": "PAULARINO 2", "color": "yellow", "perpx": "-0.725185", "perpy": "0.688554"} + {"street": "PAULARINO 2", "color": "lime", "perpx": "-0.725185", "perpy": "0.688554"} }, { @@ -2358,5 +2358,5 @@ }, "properties": - {"street": "MACARTHU1", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"} + {"street": "MACARTHU1", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} }, { @@ -2369,5 +2369,5 @@ }, "properties": - {"street": "MACARTHU1", "color": "red", "perpx": "0.740557", "perpy": "-0.671994"} + {"street": "MACARTHU1", "color": "yellow", "perpx": "0.740557", "perpy": "-0.671994"} }, { @@ -2380,5 +2380,5 @@ }, "properties": - {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"} + {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} }, { @@ -2391,5 +2391,5 @@ }, "properties": - {"street": "MACARTHU2", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "MACARTHU2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -2402,5 +2402,5 @@ }, "properties": - {"street": "DYER 1", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "DYER 1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -2413,5 +2413,5 @@ }, "properties": - {"street": "DYER 2", "color": "red", "perpx": "0.71172", "perpy": "-0.702463"} + {"street": "DYER 2", "color": "lime", "perpx": "0.71172", "perpy": "-0.702463"} }, { @@ -2424,5 +2424,5 @@ }, "properties": - {"street": "DYER 2", "color": "red", "perpx": "-0.708914", "perpy": "0.705295"} + {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"} }, { @@ -2435,5 +2435,5 @@ }, "properties": - {"street": "EDINGER 1", "color": "red", "perpx": "0", "perpy": "0"} + {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -2446,5 +2446,5 @@ }, "properties": - {"street": "EDINGER 2", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "EDINGER 2", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -2457,5 +2457,5 @@ }, "properties": - {"street": "MCFADDEN", "color": "yellow", "perpx": "-0.999946", "perpy": "-0.010425"} + {"street": "MCFADDEN", "color": "lime", "perpx": "-0.999946", "perpy": "-0.010425"} }, { @@ -2468,5 +2468,5 @@ }, "properties": - {"street": "MCFADDEN", "color": "yellow", "perpx": "0.999932", "perpy": "-0.011627"} + {"street": "MCFADDEN", "color": "lime", "perpx": "0.999932", "perpy": "-0.011627"} }, { @@ -2490,5 +2490,5 @@ }, "properties": - {"street": "S OF 5", "color": "yellow", "perpx": "-0.999756", "perpy": "0.022109"} + {"street": "S OF 5", "color": "lime", "perpx": "-0.999756", "perpy": "0.022109"} }, { @@ -2501,5 +2501,5 @@ }, "properties": - {"street": "S OF 5", "color": "yellow", "perpx": "0.999923", "perpy": "0.012439"} + {"street": "S OF 5", "color": "lime", "perpx": "0.999923", "perpy": "0.012439"} }, { @@ -2512,5 +2512,5 @@ }, "properties": - {"street": "N OF 5", "color": "yellow", "perpx": "-0.987616", "perpy": "0.156888"} + {"street": "N OF 5", "color": "lime", "perpx": "-0.987616", "perpy": "0.156888"} }, { @@ -2523,5 +2523,5 @@ }, "properties": - {"street": "N OF 5", "color": "yellow", "perpx": "0.97478", "perpy": "-0.22317"} + {"street": "N OF 5", "color": "lime", "perpx": "0.97478", "perpy": "-0.22317"} }, { Index: /trunk/webapps/js/cctvLayer.js =================================================================== --- /trunk/webapps/js/cctvLayer.js (revision 326) +++ /trunk/webapps/js/cctvLayer.js (revision 335) @@ -43,4 +43,6 @@ cctvLayer = new google.maps.Data(); cctvLayer.loadGeoJson(kCCTVfile); + // Define the clickable area on an icon (the default is too big) + var clickRegion = {coords: [0,0,14,8], type: "rect"} cctvLayer.setStyle(function(feature) { @@ -48,4 +50,5 @@ return { icon: makecctvIcon(feature.getProperty("nearVDS")), + shape: clickRegion, title: feature.getId() + " " +feature.getProperty('locationName'), visible: false Index: /trunk/webapps/js/cmsLayer.js =================================================================== --- /trunk/webapps/js/cmsLayer.js (revision 334) +++ /trunk/webapps/js/cmsLayer.js (revision 335) @@ -34,15 +34,18 @@ cmsLayer = new google.maps.Data(); cmsLayer.setMap(map); - cmsLayer.loadGeoJson(kCMSfile); + cmsLayer.loadGeoJson(kCMSfile); + // Define the clickable area on a CMS icon (the default is too big) + var clickRegion = {coords: [0,0,18,15], type: "rect"} cmsLayer.setStyle(function(feature) - { - // return the StyleOptions - return { - icon: iconCMSidle, - title: feature.getId()+ " " +feature.getProperty("location")+ " " - + feature.getProperty("street"), - visible: false - }; - }); + { + // return the StyleOptions + return { + icon: iconCMSidle, + shape: clickRegion, + title: feature.getId()+ " " +feature.getProperty("location")+ " " + + feature.getProperty("street"), + visible: false + }; + }); cmsLayer.addListener('click', function(event)