diff --git a/mycroft/skills/weather/__init__.py b/mycroft/skills/weather/__init__.py index 9aaf8a95d6..9328ae477b 100644 --- a/mycroft/skills/weather/__init__.py +++ b/mycroft/skills/weather/__init__.py @@ -86,7 +86,6 @@ class WeatherSkill(MycroftSkill): self.enclosure.activate_mouth_listeners(False) self.enclosure.weather_display(img_code, temp) self.speak_dialog('current.weather', data) - self.__condition_feedback(weather) time.sleep(5) self.enclosure.activate_mouth_listeners(True) except APICallError as e: @@ -95,14 +94,6 @@ class WeatherSkill(MycroftSkill): LOGGER.debug(e) LOGGER.error("Error: {0}".format(e)) - # TODO - Mapping from http://openweathermap.org/weather-conditions - def __condition_feedback(self, weather): - status = weather.get_status() - if status == 'clear': - self.speak_dialog('sunny.weather') - elif status == 'rain': - self.speak_dialog('rain.weather') - def handle_next_hour_intent(self, message): try: location = message.metadata.get("Location", self.location) @@ -115,7 +106,6 @@ class WeatherSkill(MycroftSkill): self.enclosure.activate_mouth_listeners(False) self.enclosure.weather_display(img_code, temp) self.speak_dialog('hour.weather', data) - self.__condition_feedback(weather) time.sleep(5) self.enclosure.activate_mouth_listeners(True) except APICallError as e: @@ -136,7 +126,6 @@ class WeatherSkill(MycroftSkill): self.enclosure.activate_mouth_listeners(False) self.enclosure.weather_display(img_code, temp) self.speak_dialog('tomorrow.weather', data) - self.__condition_feedback(weather) time.sleep(5) self.enclosure.activate_mouth_listeners(True) except APICallError as e: diff --git a/mycroft/skills/weather/dialog/en-us/rain.weather.dialog b/mycroft/skills/weather/dialog/en-us/rain.weather.dialog deleted file mode 100644 index e8fcb944ae..0000000000 --- a/mycroft/skills/weather/dialog/en-us/rain.weather.dialog +++ /dev/null @@ -1,2 +0,0 @@ -You should probably grab an umbrella. -You'll want a coat. \ No newline at end of file diff --git a/mycroft/skills/weather/dialog/en-us/sunny.weather.dialog b/mycroft/skills/weather/dialog/en-us/sunny.weather.dialog deleted file mode 100644 index 4dd902b80c..0000000000 --- a/mycroft/skills/weather/dialog/en-us/sunny.weather.dialog +++ /dev/null @@ -1,3 +0,0 @@ -Better grab some sunglasses. -Keep to the shade. -It's going to be a lovely day.