created Version 3.1

Reviewed-on: Silias-Public/Sonnendach#7

Balkendiagram.py

@@ -1,40 +0,0 @@
-import matplotlib.pyplot as plt
-import numpy as np
-
-def create_barchart(barChartMonth, barChartData, color, image_folder_barcharts, image_filename):
-    barChartMonth.reverse()
-    barChartData.reverse()
-
-    max_wert = max(barChartData)
-    min_wert = min(barChartData)
-    skala = max_wert + max_wert * 0.1
-
-    plt.figure(figsize=(7, 3))
-    plt.bar(barChartMonth, barChartData, color=color)
-
-    plt.ylabel('Stromproduktion in Franken', fontsize=12)
-
-    plt.ylim(0, skala)
-
-    # Turn off the frame (border) around the graphic
-    ax = plt.gca()  # Get the current axis
-    ax.spines['top'].set_visible(False)
-    ax.spines['right'].set_visible(False)
-    ax.spines['bottom'].set_visible(False)
-
-    plt.xticks(barChartMonth)
-    # Set the x-axis limits to remove extra space on the right
-    # plt.xlim(barChartMonth[0], barChartMonth[-1])
-
-    plt.savefig(f"{image_folder_barcharts}{image_filename}", bbox_inches='tight')
-    plt.show()
-
-
-barChartMonth = [8, 7, 6, 5, 4, 3, 2, 1, 12, 11, 10, 9]
-barChartMonth = [str(item) for item in barChartMonth]
-
-barChartData=[612.9508602242413, 774.9497310367794, 905.1661458663121, 700.3920174038531, 455.8453881411557, 362.9725109507848, 243.91420489011418, 106.40652073925607, 98.73508056571949, 140.51124465669344, 293.31970563938467, 442.59112071461107]
-image_folder_barcharts = "barcharts/"
-image_filename = "test-file.png"
-color = "red"
-create_barchart(barChartMonth, barChartData, color, image_folder_barcharts, image_filename)

Sonnendach.py

@@ -24,11 +24,12 @@ import requests
 import statistics
 from webdriver_manager.firefox import GeckoDriverManager
 
-DropDownLabels = ["Street: ", "Number: ", "Postal code: ", "City: ", "coordinate X", "coordinate Y", "Sonnendach URL: ", "Suitability:", "Image Filename: ", "PV Production 100", "Value Electricity production", "Roof area", "existing PV Production"]
+DropDownLabels = ["Street: ", "Number: ", "Postal code: ", "City: ", "coordinate X", "coordinate Y", "Sonnendach URL: ", "Suitability:", "Image Filename: ", "PV Production 75", "Value Electricity production", "Roof area", "existing PV Production Power", "existing PV Production begining of operation"]
 file_split_char = ","
 minRoofSize = 2
 minSuitability = 3
 electricityPrice = 0.198
+electricityUsageFactor = 0.75
 OptionList = []
 exit = False
 stopThread = False
@@ -175,11 +176,12 @@ def search_adresses(adress_list, filename_adresslist, driver, mainText):
                         barChartMonth = response_all_roofs_decoded[0]['attributes']['monate']
                         barChartData = [0] * 12
                         for roof in response_all_roofs_decoded:
-                            energy = float(roof['attributes']['gstrahlung'])*0.2*0.8
+                            energy = float(roof['attributes']['gstrahlung'])*0.2*0.8*electricityUsageFactor
-                            if(energy > bestRoofEnergy):
+
-                                bestRoofEnergy = energy
-                                bestRoof = roof
                             if(float(roof['attributes']['flaeche']) > minRoofSize and int(roof['attributes']['klasse']) >= minSuitability):
+                                if (energy > bestRoofEnergy):
+                                    bestRoofEnergy = energy
+                                    bestRoof = roof
                                 for month_count in range(12):
                                     barChartData[month_count] = barChartData[month_count] + float(
                                         roof['attributes']['monats_ertrag'][month_count]) * float(
@@ -199,7 +201,8 @@ def search_adresses(adress_list, filename_adresslist, driver, mainText):
 
             roof_is_suitable = True # TODO decide if roof is suitable
 
-            existing_solar_panel_power = "none"
+            existing_solar_panel_power = "error"
+            existing_solar_panel_begining_of_operation = "error"
             roof_has_solarpanel = False # TODO check if roof has solar Panel
 
             #Check if there is solar panel existing
@@ -219,9 +222,14 @@ def search_adresses(adress_list, filename_adresslist, driver, mainText):
                 results = (repsonse_solar_panel_decoded['results'])
                 if(len(results) > 0):
                     existing_solar_panel_power = results[0]['attributes']['total_power']
+                    existing_solar_panel_begining_of_operation = results[0]['attributes']['beginning_of_operation']
+                else:
+                    existing_solar_panel_power = "none"
+                    existing_solar_panel_begining_of_operation = "none"
 
             except:
-                existing_solar_panel_power = "not-found"
+                existing_solar_panel_power = "error"
+                existing_solar_panel_begining_of_operation = "error"
                 roof_has_solarpanel = False
 
             if(found and createImages.get() > 0 and roof_is_suitable and (not roof_has_solarpanel)):
@@ -245,26 +253,26 @@ def search_adresses(adress_list, filename_adresslist, driver, mainText):
             else:
                 image_filename = "not-created"
 
-            print("saving Address: " + address_string)
+            # print("saving Address: " + address_string)
             save_information_to_addresslist(adress, adress_list, columnIndexes, coordinates, file_split_char, i,
                                             image_filename, sumEnergyRoofs, sumRoofArea, suitability, url,
-                                            value_electricity_production, existing_solar_panel_power)
+                                            value_electricity_production, existing_solar_panel_power, existing_solar_panel_begining_of_operation)
 
+        if(i % 100 == 0 or i + 1 == address_count):
             save_addresslist_in_file(adress_list, filename_adresslist)
-
-
-            if(found):
-                street = adress[columnIndexes[0]] + " " + adress[columnIndexes[1]]
-                plz = adress[columnIndexes[2]]
-                city = adress[columnIndexes[3]]
-                create_Partner_in_dolibarr(street, plz, city, coordinates, sumEnergyRoofs, sumRoofArea, suitability, featureId, url, response_all_roofs_decoded)
-
-            print("saved Address: " + address_string)
             print("Address " + str(i) + " of " + str(address_count))
             timediff = relativedelta(datetime.datetime.now(), startTime)
             print("Process is running since %d years %d months %d days %d hours %d minutes %d seconds" % (
                 timediff.years, timediff.months, timediff.days, timediff.hours, timediff.minutes, timediff.seconds))
 
+            # if(found):
+                # street = adress[columnIndexes[0]] + " " + adress[columnIndexes[1]]
+                # plz = adress[columnIndexes[2]]
+                # city = adress[columnIndexes[3]]
+                # create_Partner_in_dolibarr(street, plz, city, coordinates, sumEnergyRoofs, sumRoofArea, suitability, featureId, url, response_all_roofs_decoded)
+
+
+
 
         if(stopThread == True):
             print("closing Thread")
@@ -278,7 +286,7 @@ def search_adresses(adress_list, filename_adresslist, driver, mainText):
 
 def save_information_to_addresslist(adress, adress_list, columnIndexes, coordinates, file_split_char, list_index,
                                     image_filename, pv_Production100, roof_area, suitability, url,
-                                    value_electricity_production, existing_solar_panel_power):
+                                    value_electricity_production, existing_solar_panel_power, existing_solar_panel_begining_of_operation):
     # Save Information in Addresslist
     adress[columnIndexes[4]] = str(coordinates[0])
     adress[columnIndexes[5]] = str(coordinates[1])
@@ -289,20 +297,15 @@ def save_information_to_addresslist(adress, adress_list, columnIndexes, coordina
     adress[columnIndexes[10]] = value_electricity_production
     adress[columnIndexes[11]] = roof_area
     adress[columnIndexes[12]] = existing_solar_panel_power
-    new_line_string = ""
+    adress[columnIndexes[13]] = existing_solar_panel_begining_of_operation
-    for j in adress:
+    new_line_string = file_split_char.join(str(j) for j in adress)
-        new_line_string = new_line_string + str(j) + file_split_char
     adress_list[list_index] = new_line_string
 
 
-def save_addresslist_in_file(adress_list, filename_adresslist):
+def save_addresslist_in_file(address_list, filename_addresslist):
-    new_adress_list = ""
+    with open(filename_addresslist, "w", encoding="utf-8") as address_file:
-    for j in adress_list:
+        for address in address_list:
-        new_adress_list = new_adress_list + (j) + "\n"
+            address_file.write(f"{address}\n")
-    # save File
-    adress_file = open(filename_adresslist, "w", encoding="utf-8")
-    adress_file.write(new_adress_list)
-    adress_file.close()
 
 def create_Partner_in_dolibarr(street, plz, city, coordinates, sumEnergyRoofs, sumRoofArea, suitability, featureId, url, roofs):
     global electricityPrice

api-Test.py

@@ -2,7 +2,7 @@
 import json
 import requests
 
-search_string = "Mattenweg 29 5600 Lenzburg"
+search_string = "Toggenburgstrasse 31 8245 Feuerthalen"
 
 #Address to coordinates
 params={
@@ -54,6 +54,4 @@ response_all_roofs = requests.get('https://api3.geo.admin.ch/rest/services/api/M
 response_all_roofs_decoded = json.loads(response_all_roofs.content.decode())['results']
 for roof in response_all_roofs_decoded:
     # print(roof['attributes'].keys())
-    print("URL:", "https://www.uvek-gis.admin.ch/BFE/sonnendach/index.html?featureId=" + str(roof['featureId']) + "&lang=de", "Fläche:", roof['attributes']['flaeche'], "Eignung(1-5):", roof['attributes']['klasse'], "PV100:", float(roof['attributes']['gstrahlung']*0.2*0.8))
+    print("URL:", "https://www.uvek-gis.admin.ch/BFE/sonnendach/index.html?featureId=" + str(roof['featureId']) + "&lang=de", "Fläche:", roof['attributes']['flaeche'], "Eignung(1-5):", roof['attributes']['klasse'], "PV100:", float(roof['attributes']['gstrahlung']*0.2*0.8))
-
-    print(roof)