Updating customisations with commenting

pygeoapi/provider/oracle.py

@@ -274,20 +274,20 @@
         LOGGER.debug("Table: " + table)
 
         if self.context == "query":
             #GA Customisation - Multiple columns are returned as we are populating multiple columns in the schema
 
             type_columns = dict(self._get_table_columns(schema, table)[0])
             comment_columns = dict(self._get_table_columns(schema, table)[1])
             mandatory_columns = dict(self._get_table_columns(schema, table)[2])
 
             #End GA Customisation
 
             # Populate dictionary for columns with column type
             # NOTE: we want all columns available here because they are
             #       used for filtering in the where clause, not only
             #       the ones that are returned to the client.
 
             #GA Custimisation - Fields now grabs all the columns produced from the altered get_table_columns function
             for k, v in type_columns.items():
                 comment_value = comment_columns[k]
                 mandatory_value = mandatory_columns[k]
@@ -296,7 +296,7 @@
                                     "comments": comment_value,
                                     "mandatory": mandatory_value
                                     }
             #End GA Customisation
 
             filtered_columns = set(self.fields)
             if self.properties:
@@ -386,7 +386,7 @@
             schema = result[0]
             table = result[1]
 
         #GA Customisation - Add multiple queries for each column required
 
         # Get table column names and types, excluding geometry
         query_type_cols = """
@@ -411,26 +411,26 @@
 
         query_mandatory_cols = """
                      SELECT column_name, mandatory
                        FROM PUB_DATA.PIDUSER_VIEW_SCHEMA_METADATA 
                       WHERE table_name = UPPER(:table_name)
                         AND owner = UPPER(:owner)
                         AND data_type != 'SDO_GEOMETRY'
                      """ 
         with self.conn.cursor() as cur:
             #type query
             cur.execute(query_type_cols, {"table_name": table, "owner": schema})
             type_result = cur.fetchall()
             #comment query
             cur.execute(query_comment_cols, {"table_name": table, "owner": schema})
             comment_result = cur.fetchall()
             #mandatory query
             cur.execute(query_mandatory_cols, {"table_name": table, "owner": schema})
             mandatory_result = cur.fetchall()
 
         return type_result, comment_result, mandatory_result
         #End GA Customisation
 
 class OracleProvider(BaseProvider):
     def __init__(self, provider_def):
         """
         OracleProvider Class constructor
@@ -938,6 +938,7 @@
 
         :returns: feature id
         """
+        #GA Customisation - Correction to the SQL logic for retrieving the previous record (DAT-1039)
         sql = f"SELECT * \
                 FROM ( \
                 SELECT {self.id_field} AS id \

pygeoapi/templates/_base.html

@@ -43,6 +43,7 @@
           <img src="{{ config['server']['url'] }}/static/img/ga_logo_inline.png"
             title="{{ config['metadata']['identification']['title'] }}" style="height:60px;vertical-align: middle;" /></a>
         <ul class="nav nav-pills">
+    {#GA Customisation - Remove Email #}
 	  <!--
 	  <li class="nav-item">
 	  	<a href="mailto:{{ config['metadata']['contact']['email'] }}" class="nav-link" aria-current="page">Contact</a>
@@ -99,6 +100,7 @@
       </div>
     </div>
     </main>
+    {#GA Customisation - Custom Footer #}
     <footer  style="background:linear-gradient(#082e41, #00718b);color: white; margin-top: auto;display: flex;flex-direction: column;width: 100%;vertical-align: middle;">
     <div id="footer-bottom" style="display: flex;flex-direction: column;gap: 16px;width: 100%;max-width: 990px;margin: 0 auto 20px auto;padding: 16px 12px;" >
       <div id="footer-bottom-links" style="display: flex; flex-direction: row; gap: 12px;" >

pygeoapi/templates/collections/items/index.html

@@ -171,6 +171,8 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
             layer.bindPopup(html);
         }
     });
+    {# GA Customisation - disableClusteringAtZoom: 9 parameter removed from L.markerClusterGroup. This is to fix issues with overlapping geometric points. (DAT-1053) #}
+
     {% if data['features'][0]['geometry']['type'] == 'Point' %}
     var markers = L.markerClusterGroup({
         chunkedLoading: true,

pygeoapi/templates/collections/items/item.html

@@ -155,6 +155,7 @@ <h1>{{ data['id'] }}</h1>
 
 {% block extrafoot %}
     <script>
+    {#GA customisation - coordinates on L.map default to australia instead of Canada #}
     var map = L.map('items-map').setView([{{ -25 }}, {{ 135 }}], 3.25);
     map.addLayer(new L.TileLayer(
         '{{ config['server']['map']['url'] }}', {

pygeoapi/templates/collections/schema.html

@@ -6,6 +6,7 @@
 / <a href="{{ data['dataset_path'] }}/schema">{% trans %}Schema{% endtrans %}</a>
 {% endblock %}
 {% block body %}
+  {#GA Customisation - Columns and data[properties] altered for the custom schema implementation #}
     <section id="collection-schema">
       <h1>{{ data['title'] }}</h1>
       <p>{{ data['description'] }}</p>