Cater for ERA5 weather data cells

Author: ozsolarwind

dataview.py

@@ -775,6 +775,8 @@ def getData(self, sheet=None):
         def in_map(a_min, a_max, b_min, b_max):
             return (a_min <= b_max) and (b_min <= a_max)
 
+        lat_dim = self.scene.coord_grid[0]
+        lon_dim = self.scene.coord_grid[1]
         self.clear_DataView()
         self.dataview_vars = {}
         self.dataview_items = []
@@ -817,9 +819,9 @@ def in_map(a_min, a_max, b_min, b_max):
                     else:
                         a_lat = 0
                         a_lon = 0
-                    if in_map(a_lat - 0.25, a_lat + 0.25, self.scene.map_lower_right[0],
+                    if in_map(a_lat - lat_dim / 2., a_lat + lat_dim / 2., self.scene.map_lower_right[0],
                               self.scene.map_upper_left[0]) \
-                      and in_map(a_lon - 0.3333, a_lon + 0.3333,
+                      and in_map(a_lon - lon_dim / 2., a_lon + lon_dim / 2.,
                                  self.scene.map_upper_left[1], self.scene.map_lower_right[1]):
                         self.datacells.append([stn.lat, stn.lon])
                         for i in tmp_tech:
@@ -839,9 +841,9 @@ def in_map(a_min, a_max, b_min, b_max):
                 except:
                     continue
                 a_lon = float(self.dataview_worksheet.cell_value(curr_row, self.dataview_vars['Longitude']))
-                if in_map(a_lat - 0.25, a_lat + 0.25, self.scene.map_lower_right[0],
+                if in_map(a_lat - lat_dim / 2., a_lat + lat_dim / 2., self.scene.map_lower_right[0],
                           self.scene.map_upper_left[0]) \
-                  and in_map(a_lon - 0.3333, a_lon + 0.3333,
+                  and in_map(a_lon - lon_dim / 2., a_lon + lon_dim / 2.,
                           self.scene.map_upper_left[1], self.scene.map_lower_right[1]):
                     try:
                         self.datacells.append([float(self.dataview_worksheet.cell_value(curr_row, self.dataview_vars['Latitude'])),
@@ -896,15 +898,17 @@ def dv_setText():
             self.dataview_items.append(txt)
             self.scene.addItem(self.dataview_items[-1])
 
+        lat_dim = self.scene.coord_grid[0]
+        lon_dim = self.scene.coord_grid[1]
         self.clear_DataView()
         opacity = self.opacitySpin.value()
         plot_scale = self.scaleSpin.value()
-        lon_cell = .3125
+        lon_cell = lon_dim / 2.
         cells = []
         if self.xsheet.currentText() == 'Exclude':
             for cell in self.datacells:
-                lat = round(round(cell[0] / 0.5, 0) * 0.5, 4)
-                lon = round(round(cell[1] / 0.625, 0) * 0.625, 4)
+                lat = round(round(cell[0] / lat_dim, 0) * lat_dim, 4)
+                lon = round(round(cell[1] / lon_dim, 0) * lon_dim, 4)
                 ignore = False
                 for exclude in self.exclude:
                     if exclude[0] == lat and exclude[1] == lon:
@@ -919,8 +923,8 @@ def dv_setText():
         if self.gridcentre.isChecked():
             lat_lons = {}
             for cel in range(len(cells) -1, -1, -1):
-                lat = round(round(cells[cel][0] / 0.5, 0) * 0.5, 4)
-                lon = round(round(cells[cel][1] / 0.625, 0) * 0.625, 4)
+                lat = round(round(cells[cel][0] / lat_dim, 0) * lat_dim, 4)
+                lon = round(round(cells[cel][1] / lon_dim, 0) * lon_dim, 4)
                 lat_lon = str(lat) + '_' + str(lon)
                 if lat_lon in lat_lons.keys():
                     tc = lat_lons[lat_lon]
@@ -1002,9 +1006,9 @@ def dv_setText():
                     continue
             lat = cell[0]
             lon = cell[1]
-            p = self.scene.mapFromLonLat(QtCore.QPointF(lon - lon_cell, lat + .25))
-            pe = self.scene.mapFromLonLat(QtCore.QPointF(lon + lon_cell, lat + .25))
-            ps = self.scene.mapFromLonLat(QtCore.QPointF(lon - lon_cell, lat - .25))
+            p = self.scene.mapFromLonLat(QtCore.QPointF(lon - lon_cell, lat + lat_dim / 2.))
+            pe = self.scene.mapFromLonLat(QtCore.QPointF(lon + lon_cell, lat + lat_dim / 2.))
+            ps = self.scene.mapFromLonLat(QtCore.QPointF(lon - lon_cell, lat - lat_dim / 2.))
             if plot_scale != 1.:
                 x_di = (pe.x() - p.x()) * (1 - plot_scale) / 2.
                 y_di = (ps.y() - p.y()) * (1 - plot_scale) / 2.

help.html

@@ -3570,12 +3570,12 @@ <h3 id="resourcegrid">Resource Grids</h3>
 <p>This feature utilises summary data stored in a file rather than having to process hourly data from the weather files (see <a href="#resource">Visualising Renewable Resource Attributes</a>).</p>
 <div class="experiment">
 <h3 id="dataview">Data View</h3>
-<p>This experimental feature overlays a set of pie charts or bar charts on the Powermap map, either at individual station locations or based upon the grid of MERRA-2 &ldquo;weather&rdquo; cells. It can be used to visualise the contribution to overall generation from a group of stations. This could assist with identifying optimal placement of stations. For example, identifying potential Renewable Energy Zones could be assisted by running SAM models for identically sized stations placed within each of the cells. When the program is invoked it will display Powermap's coordinates grid. By default the grid is based on geographic coordinates but can be set to show the MERRA-2 cells by setting the <em>merra2_grid</em> property of the <a href="#p_view">[View]</a> Section of the Preferences file to <em>True</em>. The program can accept data in two formats:</p>
+<p>This experimental feature overlays a set of pie charts or bar charts on the Powermap map, either at individual station locations or based upon the grid of &ldquo;weather&rdquo; cells. It can be used to visualise the contribution to overall generation from a group of stations. This could assist with identifying optimal placement of stations. For example, identifying potential Renewable Energy Zones could be assisted by running SAM models for identically sized stations placed within each of the cells. When the program is invoked it will display Powermap's coordinates grid. By default the grid is based on geographic coordinates but can be set to show the weather cells by setting the <em>coord_grid</em> property of the <a href="#p_view">[View]</a> Section of the Preferences file to either <em>e</em> for ERA5-derived weather data or <em>m</em> for MERRA-2 derived weather data. The program can accept data in two formats:</p>
 <ol>
 <li>A table of latitudes and longitudes containing the generation in each location for a number of RE technologies, or</li>
 <li>The summary table from a Powermodel execution from Powermap which contains a list of stations, their technology and generation. This format requires the stations in the list to be present in the Scenarios loaded into Powermap</li>
 </ol>
-<p>The program analyses the generation figures for each or all technologies and ovelays charts that show the relative generation for each station or weather cell compared to the maximum generation figure. In Bar Charts the bars are relative to the maximum generation for any technology while percentages are either relative to the total for the cell or for each technology. In Pie Charts the pie slices indicate the contribution of each technology and the total pie slices and percentages are relative to the maximum generation. The base size (scale) of the charts are the same size as the MERRA-2 cells.</p>
+<p>The program analyses the generation figures for each or all technologies and ovelays charts that show the relative generation for each station or weather cell compared to the maximum generation figure. In Bar Charts the bars are relative to the maximum generation for any technology while percentages are either relative to the total for the cell or for each technology. In Pie Charts the pie slices indicate the contribution of each technology and the total pie slices and percentages are relative to the maximum generation. The base size (scale) of the charts are the same size as the weather cells.</p>
 <p>The Data View options (Properties) are specified in the <a href="#p_dataview">[Dataview]</a> Section of the Preferences file. The associated property is indicated in brackets at the end of the description. The Data View menu displayed by invoking the <em>Show Data View</em> menu option. The menu presented has the following fields:</p>
 <table border="0" class="none">
 <tr><td class="top" style="width: 15%;"><dfn>Recent Files</dfn></td>