var

jack-blackson · Jan 29, 2024 · 0b26483 · 0b26483
1 parent 1da6e84
commit 0b26483
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 4 deletions.
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -80,6 +80,8 @@
 
             }).trigger('change');
             onChange(false);
+            $('#loadSetup').click(loadSetup);
+
             console.log('Settings loaded')
 
 		}
@@ -250,6 +252,12 @@
             return arr; // returns array
         }
 
+        function loadSetup() {
+        //var newValue = JSON.stringify(getSettings());
+            console.log('Testfunction')
+        }
+
+
 		// This will be called by the admin adapter when the user presses the save button
 		function save(callback) {
 			// example: select elements with class=value and build settings object
@@ -371,6 +379,23 @@ <h6 class="title translate" data-lang="regionsetup">regionsetup</h6>
             <div class="row">
 
             </div>
+
+            <div class="row">
+                <div class="input-field col s3">
+                    <input type="text" id="lat" class="value" />
+                    <label for="lat" class="translate">Lattitude</label>
+                </div>
+                <div class="input-field col s3">
+                    <input type="text" id="long" class="value" />
+                    <label for="long" class="translate">Longitude</label>
+                </div>
+                <div class="row">
+                    <div class="col s4">
+                        <a id="loadSetup" class="waves-effect waves-light btn"><i class="material-icons left">notifications_active</i><span class="translate">loadSetup</span></a>
+                    </div>
+                </div>
+
+            </div>
 
             <div class="col s12">
                 <h6 class="title translate" data-lang="layout">layout</h6>

diff --git a/io-package.json b/io-package.json
@@ -1,8 +1,21 @@
 {
     "common": {
         "name": "meteoalarm",
-        "version": "2.3.8",
+        "version": "3.0.0",
         "news": {
+            "3.0.0": {
+                "en": "Breaking change: Switch to polygon data",
+                "de": "Große Änderung: Umschalten auf Polygondaten",
+                "ru": "Перерыв: Переключение на данные полигона",
+                "pt": "Mudança de ruptura: Mudar para dados de polígono",
+                "nl": "Verandering: Omschakelen naar veelhoekgegevens",
+                "fr": "Briser le changement : Passer aux données polygonales",
+                "it": "Cambiamento di rottura: Passare ai dati del poligono",
+                "es": "Cambio de ruptura: Cambiar a datos de polígono",
+                "pl": "Łamanie zmian: Przełącz na dane wielokąta",
+                "uk": "Зміна розривів: Перемикач даних полігонів",
+                "zh-cn": "中断更改 : 切换到多边形数据"
+            },
             "2.3.8": {
                 "en": "Bugfix alarm reference",
                 "de": "Bugfix Alarm Referenz",

diff --git a/main.js b/main.js
@@ -13,6 +13,7 @@ const utils = require('@iobroker/adapter-core');
 //const request = require('request');
 const moment = require('moment');
 const util = require('util')
+const turf = require('@turf/boolean-point-in-polygon')
 var parseString = require('xml2js').parseString;
 var parseStringPromise = require('xml2js').parseStringPromise;
 const stateAttr = require('./lib/stateAttr.js'); // State attribute definitions
@@ -32,6 +33,8 @@ var DescFilter2 = '';
 var country = '';
 var countryConfig = '';
 var regionConfig = '';
+var latConfig = '';
+var longConfig = '';
 var countEntries = 0;
 var typeArray = [];
 var urlArray = [];
@@ -237,7 +240,11 @@ async function getData(){
         regionName = adapter.config.regionName
         imageSizeSetup = Number(adapter.config.imageSize)
         alarmAll = []
-
+
+        latConfig = adapter.config.lat
+        longConfig = adapter.config.long
+
+        //adapter.log.debug('Longitute : ' + longConfig)
 
         if (regionConfig  == "0"|| !regionConfig){
             adapter.log.error('Please select a valid region in setup!')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.meteoalarm",
-  "version": "2.3.8",
+  "version": "3.0.0",
   "description": "Meteolaram",
   "main": "main.js",
   "repository": {
@@ -29,7 +29,8 @@
     "bent": "^7.3.12",
     "csv-parse": "4.16.3",
     "moment": "2.30.1",
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.5.0",
+    "@turf/boolean-point-in-polygon": "^6.5.0"
   },
   "scripts": {
     "test": "npm run test:package && npm run test:unit",