removed county pop circles/nadded county lines when zoomed in/nadded school icons
This commit is contained in:
		
							parent
							
								
									fba4b3f649
								
							
						
					
					
						commit
						ae3a65438e
					
				
					 3 changed files with 28 additions and 15 deletions
				
			
		
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								other/school_FILL0_wght400_GRAD0_opsz24.png
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								other/school_FILL0_wght400_GRAD0_opsz24.png
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 1 KiB | 
|  | @ -96,7 +96,11 @@ WI_schools <- WI_schools %>% | ||||||
|          LAT > 0) %>% |          LAT > 0) %>% | ||||||
|   select("SCHOOL", "DISTRICT", "SCHOOLTYPE", "LAT", "LON") |   select("SCHOOL", "DISTRICT", "SCHOOLTYPE", "LAT", "LON") | ||||||
| 
 | 
 | ||||||
| school_symbol <- image_read_svg(path = "other/school_FILL0_wght400_GRAD0_opsz24.svg") | school_symbol <- makeIcon(iconUrl = "other/school_FILL0_wght400_GRAD0_opsz24.png", | ||||||
|  |                           iconWidth = 24, | ||||||
|  |                           iconHeight = 24, | ||||||
|  |                           iconAnchorX = 12, | ||||||
|  |                           iconAnchorY = 12) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| focus_columns <- c("PedestrianInjurySeverity", "CrashDate", "CrashTime", "County", "Street", "CrossStreet", "PedestrianAge", "Year", "vulnerable_role") | focus_columns <- c("PedestrianInjurySeverity", "CrashDate", "CrashTime", "County", "Street", "CrossStreet", "PedestrianAge", "Year", "vulnerable_role") | ||||||
|  | @ -171,9 +175,15 @@ wisconsin_crash_map <- | ||||||
|   #  addControl(title, position = "topleft", className="map-title") %>% |   #  addControl(title, position = "topleft", className="map-title") %>% | ||||||
|   #  addControl(subtitle, position = "bottomleft", className="map-subtitle") %>% |   #  addControl(subtitle, position = "bottomleft", className="map-subtitle") %>% | ||||||
|   addProviderTiles(providers$Stadia.AlidadeSmooth) %>% |   addProviderTiles(providers$Stadia.AlidadeSmooth) %>% | ||||||
|  |   addPolygons(data = County_Crash_geom, | ||||||
|  |               color = "black", | ||||||
|  |               weight = 1, | ||||||
|  |               fill = FALSE, | ||||||
|  |               group = "Crash Points") %>% | ||||||
|   addMarkers(data = WI_schools, |   addMarkers(data = WI_schools, | ||||||
|              lng=WI_schools$LON, |              lng=WI_schools$LON, | ||||||
|              lat = WI_schools$LAT, |              lat = WI_schools$LAT, | ||||||
|  |              icon = school_symbol, | ||||||
|              label = lapply(paste0("<b>", WI_schools$SCHOOL, " School</b></br>", |              label = lapply(paste0("<b>", WI_schools$SCHOOL, " School</b></br>", | ||||||
|                                    WI_schools$DISTRICT, " School District</br>", |                                    WI_schools$DISTRICT, " School District</br>", | ||||||
|                                    WI_schools$SCHOOLTYPE), htmltools::HTML), |                                    WI_schools$SCHOOLTYPE), htmltools::HTML), | ||||||
|  | @ -193,16 +203,16 @@ wisconsin_crash_map <- | ||||||
|                                          Pedestrian_Crash_Data$vulnerable_role, " age: ", Pedestrian_Crash_Data$PedestrianAge), htmltools::HTML), |                                          Pedestrian_Crash_Data$vulnerable_role, " age: ", Pedestrian_Crash_Data$PedestrianAge), htmltools::HTML), | ||||||
|                    group = "Crash Points") %>% |                    group = "Crash Points") %>% | ||||||
|   addLegend(position = "bottomleft", labels = injury_severity$InjSevName, colors = injury_severity$color, group = "Crash Points", title = "Injury Severity") %>% |   addLegend(position = "bottomleft", labels = injury_severity$InjSevName, colors = injury_severity$color, group = "Crash Points", title = "Injury Severity") %>% | ||||||
|   addCircleMarkers(data = County_Crash_geom, | #  addCircleMarkers(data = County_Crash_geom, | ||||||
|                    lng=County_Crash_geom$longitude, | #                   lng=County_Crash_geom$longitude, | ||||||
|                    lat=County_Crash_geom$latitude, | #                   lat=County_Crash_geom$latitude, | ||||||
|                    #fillColor=county_pal(County_Crash_geom$CrashesPerPopulation), | #                   #fillColor=county_pal(County_Crash_geom$CrashesPerPopulation), | ||||||
|                    radius=County_Crash_geom$value/20000, | #                   radius=County_Crash_geom$value/20000, | ||||||
|                    stroke = TRUE, | #                   stroke = TRUE, | ||||||
|                    color = "black", | #                   color = "black", | ||||||
|                    weight = 1, | #                   weight = 1, | ||||||
|                    fillOpacity = 0.5, | #                   fillOpacity = 0.5, | ||||||
|                    group = "Counties") %>% | #                   group = "Counties") %>% | ||||||
|   addPolygons(data = County_Crash_geom, |   addPolygons(data = County_Crash_geom, | ||||||
|               color = "black", |               color = "black", | ||||||
|               weight = 1, |               weight = 1, | ||||||
|  | @ -213,12 +223,15 @@ wisconsin_crash_map <- | ||||||
|                                     "average crashes per year: ", round(County_Crash_geom$MeanCrashes,0), "</br>", |                                     "average crashes per year: ", round(County_Crash_geom$MeanCrashes,0), "</br>", | ||||||
|                                     "average crashes/year per 100k residents: ", round(County_Crash_geom$CrashesPerPopulation,0)), htmltools::HTML), |                                     "average crashes/year per 100k residents: ", round(County_Crash_geom$CrashesPerPopulation,0)), htmltools::HTML), | ||||||
|               group = "Counties") %>% |               group = "Counties") %>% | ||||||
|   addLegend(position = "bottomleft", pal = county_pal, values = County_Crash_geom$CrashesPerPopulation, group = "Counties", title = "Circle size = county population<br><br>Color = Crashes/year</br>(normalized per 100k residents)") %>% |   addLegend(position = "bottomleft", pal = county_pal, values = County_Crash_geom$CrashesPerPopulation, group = "Counties", title = "Crashes/year</br>(normalized per 100k residents)") %>% | ||||||
|   #  addLegendSize(position = "bottomright", color = "black", shape = "circle", values = County_Crash_geom$value, group = "Counties", title = "Total crashes") %>% |   #  addLegendSize(position = "bottomright", color = "black", shape = "circle", values = County_Crash_geom$value, group = "Counties", title = "Total crashes") %>% | ||||||
|   groupOptions(group = "Schools", zoomLevels = 13:20) %>% |   groupOptions(group = "Schools", zoomLevels = 13:20) %>% | ||||||
|   groupOptions(group = "Crash Points", zoomLevels = 10:20) %>% |   groupOptions(group = "Crash Points", zoomLevels = 10:20) %>% | ||||||
|   groupOptions(group ="Counties", zoomLevels = 1:9) |   groupOptions(group ="Counties", zoomLevels = 1:9) | ||||||
|  |    | ||||||
|  | wisconsin_crash_map | ||||||
| 
 | 
 | ||||||
| saveWidget(wisconsin_crash_map, file = "figures/dynamic_crash_maps/wisconsin_pedestrian_crash_map.html", selfcontained = TRUE) | saveWidget(wisconsin_crash_map, file = "figures/dynamic_crash_maps/wisconsin_pedestrian_crash_map.html", selfcontained = TRUE) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue