The city of Minnetonka announced the death of Deputy Fire Marshal Shawn Johnson of the Minnetonka Fire Department, who died after a two-year battle with cancer.