1.10

SFOE · Sep 29, 2022 · ccae018 · ccae018
1 parent 0aba836
commit ccae018
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/assets/js/external_apis.js b/assets/js/external_apis.js
@@ -65,10 +65,8 @@ function getEVUs(MunicipalityNumber) {
 
 
 function getTarifData(EvuData) {
-	console.log(EvuData[0])
 
-	if ("nrElcom" in EvuData[0]) {
-		console.log("asdf")
+	if (EvuData[0].hasOwnProperty("nrElcom")) {
 
 		query = "https://bfe-cors.geotest.ch/https://opendata.vese.ch/pvtarif/api/getData/evu?evuId=" + EvuData[0].nrElcom + "&year=22&licenseKey=110xketkdbydpa8ph7s36nmeqxrq5eg8f1xbzz1g";
 
@@ -92,7 +90,7 @@ function getTarifData(EvuData) {
 
 	}
 
-	if ("nrElcom" in EvuData[1]) {
+	if (EvuData.length > 1 && EvuData[1].hasOwnProperty("nrElcom")) {
 
 		query = "https://bfe-cors.geotest.ch/https://opendata.vese.ch/pvtarif/api/getData/evu?evuId=" + EvuData[1].nrElcom + "&year=22&licenseKey=110xketkdbydpa8ph7s36nmeqxrq5eg8f1xbzz1g";
 
@@ -114,9 +112,7 @@ function getTarifData(EvuData) {
 
 		});
 
-	}	
-
-
+	}
 }
 
 function fillContent1(data) {
@@ -183,8 +179,9 @@ function resetTarifInfo() {
     document.getElementById('stromtarifEWlink2').href = "http://www.pvtarif.ch";
   }
 
-  document.getElementById('tarif2').style = "visibility: hidden;"
-
+  if ($.contains(document.body, document.getElementById("tarif2"))) {
+	document.getElementById('tarif2').style = "visibility: hidden;"
+  }
 }
 
 

diff --git a/assets/js/init.js b/assets/js/init.js
@@ -85,7 +85,7 @@ var updateRoofInfo = function(map, marker, roof) {
   $('#eignung3').html(suitability.substr(0, 1).toUpperCase() + suitability.substr(1));
 
   if ($.contains(document.body, document.getElementById("stromertrag"))) {
-    $('#stromertrag').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.17*0.8)/100)*100));
+    $('#stromertrag').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.2*0.8)/100)*100));
   }
 
   //**** NEW
@@ -170,10 +170,10 @@ var updateRoofInfo = function(map, marker, roof) {
 
   var finanzertrag;
 
-  if (roof.attributes.finanzertrag < 1000) {
-    finanzertrag = formatNumber(Math.round(roof.attributes.finanzertrag/10)*10);
+  if (roof.attributes.gstrahlung*0.2*0.8/10 < 1000) {
+    finanzertrag = formatNumber(Math.round(roof.attributes.gstrahlung*0.2*0.8/10/10)*10);
   } else {
-    finanzertrag = formatNumber(Math.round(roof.attributes.finanzertrag/100)*100);
+    finanzertrag = formatNumber(Math.round(roof.attributes.gstrahlung*0.2*0.8/10/100)*100);
   }
 
   if ($.contains(document.body, document.getElementById("finanzertrag"))) {
@@ -203,7 +203,7 @@ var updateRoofInfo = function(map, marker, roof) {
     }
 
     TitelSolarstromText += '<strong>'
-      + formatNumber(Math.round((roof.attributes.gstrahlung*0.17*0.8)/100)*100)
+      + formatNumber(Math.round((roof.attributes.gstrahlung*0.20*0.8)/100)*100)
       + '</strong> '
       + translator.get('solarstromTitel')
       + '<strong> '
@@ -237,9 +237,9 @@ var updateRoofInfo = function(map, marker, roof) {
 
   }
 
-  $('#pv100').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.17*0.8)/100)*100*1));
-  $('#pv75').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.17*0.8)/100)*100*0.75));
-  $('#pv50').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.17*0.8)/100)*100*0.5));
+  $('#pv100').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.2*0.8)/100)*100*1));
+  $('#pv75').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.2*0.8)/100)*100*0.75));
+  $('#pv50').html(formatNumber(Math.round((roof.attributes.gstrahlung*0.2*0.8)/100)*100*0.5));
 
   // check if no waermeertrag and if no dg_waermebedarf
   var titleHeat = '';

diff --git a/assets/js/translations.js b/assets/js/translations.js
diff --git a/index.html b/index.html
@@ -616,7 +616,7 @@ <h2><span class="trn">hint</span></h2>
       </ul>
       <ul class="copyright">
         <li><span class="trn">copyrightMain</span></li>
-        <li>v 1.9.1</li>
+        <li>v 1.10</li>
         <li><span class="trn">contact</span></li>
         <li class="trn">impressumAnalyse</li>
         <li>Design: <a href="http://html5up.net">HTML5 UP</a></li>

diff --git a/print.html b/print.html
@@ -311,10 +311,18 @@ <h3 class="trn">stromtarifTitel</h3>
       <table class="table-with-border kernkraftwerke-extended" cellpadding="5">
         <tr>
           <th class="cell-meta" style="vertical-align:top">
-            <a href="" target="_blank" id="stromtarifEWlink"><span id="stromtarifEW"></span></a>
+            <a href="" target="_blank" id="stromtarifEWlink1"><span id="stromtarifEW1"></span></a>
           </th>
           <td>
-            <span id="stromtarifEWZahl">0.00</span> <span id="stromtarifEWEinheit">
+            <span id="stromtarifEWZahl1">0.00</span> <span id="stromtarifEWEinheit1">
+          </td>
+        </tr>
+        <tr id="tarif2">
+          <th class="cell-meta" style="vertical-align:top">
+            <a href="" target="_blank" id="stromtarifEWlink2"><span id="stromtarifEW2"></span></a>
+          </th>
+          <td>
+            <span id="stromtarifEWZahl2">0.00</span> <span id="stromtarifEWEinheit2">
           </td>
         </tr>
         <tr>