From 57e20a699a9fe683c16bb97c815309ba5bedfcd2 Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Thu, 11 Jul 2019 14:04:24 +0000
Subject: [PATCH] 95_Astro: add keywords

git-svn-id: https://svn.fhem.de/fhem/trunk@19817 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/95_Astro.pm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/fhem/FHEM/95_Astro.pm b/fhem/FHEM/95_Astro.pm
index 50498f147..edf9fbc8e 100644
--- a/fhem/FHEM/95_Astro.pm
+++ b/fhem/FHEM/95_Astro.pm
@@ -776,7 +776,8 @@ sub Define ($@) {
 
  if ($global) {
    return "$type global device $modules{$type}{global}{NAME} is already defined"
-     if ( defined( $modules{$type}{global} ) );
+     if ( defined( $modules{$type}{global} )
+       && $modules{$type}{global}{NAME} ne $name );
    $modules{$type}{global} = $hash;
    $hash->{SCOPE} = 'global';
  }
@@ -1141,7 +1142,7 @@ sub SUNRISE_EL_sr_alt($$$$$$$$$) {
       $hasalt = 1;
       $altit=$main::alti{uc($altit)};
       shift;
-  } elsif($altit =~ /HORIZON=([\-\+]*[0-9\.]+)/i) {
+  } elsif($altit =~ /HORIZON=(([\-\+]*[0-9\.]+)(?::([\-\+]*[0-9\.]+))?)/i) {
       $hasalt = 1;
       $altit=$1;
       shift;
@@ -3195,7 +3196,7 @@ sub Get($@) {
 =end html_DE
 =for :application/json;q=META.json 95_Astro.pm
 {
-  "version": "v2.1.0",
+  "version": "v2.1.1",
   "author": [
     "Prof. Dr. Peter A. Henning <>",
     "Julian Pawlowski <>",
@@ -3216,16 +3217,24 @@ sub Get($@) {
     "astronomy",
     "constellation",
     "moon",
+    "moonrise",
+    "moonset",
     "sun",
+    "sunrise",
+    "sunset",
     "star sign",
     "twilight",
     "zodiac",
     "Astrologie",
     "Astronomie",
     "Mond",
+    "Mondaufgang",
+    "Monduntergang",
     "Sonne",
     "Sternbild",
     "Sternzeichen",
+    "Sonnenaufgang",
+    "Sonnenuntergang",
     "Tierkreiszeichen",
     "Zodiak"
   ],