From 1fe2285187d5d73981a6ff3f10a2fd050f6ba275 Mon Sep 17 00:00:00 2001
From: paul van genuchten <genuchten@yahoo.com>
Date: Tue, 20 Dec 2022 15:09:18 +0100
Subject: [PATCH] add scale/resolution to spatial section resolves #189

---
 pygeometa/schemas/iso19139/__init__.py | 13 +++++++++++++
 pygeometa/schemas/iso19139/main.j2     | 22 ++++++++++++++++++++++
 pygeometa/schemas/mcf/core.yaml        | 21 +++++++++++++++++++++
 tests/md-SMJP01RJTD-gmd.xml            | 11 +++++++++++
 4 files changed, 67 insertions(+)

diff --git a/pygeometa/schemas/iso19139/__init__.py b/pygeometa/schemas/iso19139/__init__.py
index 47e4198..531ebe2 100644
--- a/pygeometa/schemas/iso19139/__init__.py
+++ b/pygeometa/schemas/iso19139/__init__.py
@@ -82,6 +82,7 @@ def import_(self, metadata: str) -> dict:
                 'version': '1.0',
             },
             'metadata': {},
+            'spatial': {},
             'identification': {},
             'contact': {},
             'distribution': {}
@@ -138,6 +139,18 @@ def import_(self, metadata: str) -> dict:
 
         mcf['identification']['extents']['temporal'].append(temp_extent)
 
+        if m.identification.denominators:
+            mcf['spatial']['denominators'] = m.identification.denominators
+
+        if m.identification.distance:
+            mcf['spatial']['resolution'] = []
+            for k, v in enumerate(m.identification.distance):
+                uom = ''
+                if m.identification.uom and len(m.identification.uom) > k:
+                    uom = m.identification.uom[k]
+                mcf['spatial']['resolution'].append({'distance': v, 
+                                                     'uom': uom})
+
         if m.identification.accessconstraints:
             mcf['identification']['accessconstraints'] = m.identification.accessconstraints[0]  # noqa
 
diff --git a/pygeometa/schemas/iso19139/main.j2 b/pygeometa/schemas/iso19139/main.j2
index efc8ecd..6d357ad 100644
--- a/pygeometa/schemas/iso19139/main.j2
+++ b/pygeometa/schemas/iso19139/main.j2
@@ -247,6 +247,28 @@
       <gmd:spatialRepresentationType>
         <gmd:MD_SpatialRepresentationTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_SpatialRepresentationTypeCode" codeSpace="ISOTC211/19115" codeListValue="{{ record['spatial']['datatype'] }}">{{ record['spatial']['datatype'] }}</gmd:MD_SpatialRepresentationTypeCode>
       </gmd:spatialRepresentationType>
+      {% for res in record['spatial']['resolutions'] %}
+      <gmd:spatialResolution>
+        <gmd:MD_Resolution>
+          <gmd:distance>
+            <gco:Distance uom="{{ res['uom'] }}">{{ res['distance'] }}</gco:Distance>
+          </gmd:distance>
+        </gmd:MD_Resolution>
+      </gmd:spatialResolution>
+      {% endfor %}
+      {% for d in record['spatial']['denominators']  %}
+      <gmd:spatialResolution>
+        <gmd:MD_Resolution>
+          <gmd:equivalentScale>
+            <gmd:MD_RepresentativeFraction>
+              <gmd:denominator>
+                <gco:Integer>{{ d }}</gco:Integer>
+              </gmd:denominator>
+            </gmd:MD_RepresentativeFraction>
+          </gmd:equivalentScale>
+        </gmd:MD_Resolution>
+      </gmd:spatialResolution>
+      {% endfor %}
       {% if record['identification']['language'] in ['inapplicable', 'missing', 'template', 'unknown', 'withheld'] %}
       <gmd:language gco:nilReason="{{ record['identification']['language'] }}"/>
       {% else %}
diff --git a/pygeometa/schemas/mcf/core.yaml b/pygeometa/schemas/mcf/core.yaml
index dac91e3..46c5f73 100644
--- a/pygeometa/schemas/mcf/core.yaml
+++ b/pygeometa/schemas/mcf/core.yaml
@@ -89,6 +89,27 @@ properties:
                     - point
                     - solid
                     - surface
+            denominators:
+                type: array
+                description:  one or two (min-max) denominators to indicate the scale of the resource
+                items:
+                    type: integer
+            resolutions:
+                type: array
+                description: one or two (min-max) distance values + uom to indicate the resolution of the resource
+                properties:
+                    distance:
+                        type: number
+                    uom: 
+                        type: string
+                        description: the unit of measure of the distance value 
+                        enum:
+                            - m
+                            - km
+                            - feet
+                            - mile
+                            - degree
+                            - parsec
         required:
             - datatype
             - geomtype
diff --git a/tests/md-SMJP01RJTD-gmd.xml b/tests/md-SMJP01RJTD-gmd.xml
index 7bdb7ef..e655a6d 100644
--- a/tests/md-SMJP01RJTD-gmd.xml
+++ b/tests/md-SMJP01RJTD-gmd.xml
@@ -315,6 +315,17 @@
           </gmd:otherConstraints>
         </gmd:MD_LegalConstraints>
       </gmd:resourceConstraints>
+      <gmd:spatialResolution>
+        <gmd:MD_Resolution>
+          <gmd:equivalentScale>
+            <gmd:MD_RepresentativeFraction>
+              <gmd:denominator>
+                <gco:Integer>10000</gco:Integer>
+              </gmd:denominator>
+            </gmd:MD_RepresentativeFraction>
+          </gmd:equivalentScale>
+        </gmd:MD_Resolution>
+      </gmd:spatialResolution>
       <gmd:language>
         <gco:CharacterString>eng</gco:CharacterString>
       </gmd:language>