Merge pull request #40 from fabianazioti/delete

Improvements

Author: raphaelrpl

docs/sphinx/cli.rst

@@ -20,7 +20,7 @@ Output::
 
 To list the available classification systems in a service, use the ``classification-systems`` command and provides a URL to the ``--url`` option::
 
-    lccs --url 'http://brazildatacube.dpi.inpe.br/dev/lccs/' classification-systems
+    lccs --url 'https://brazildatacube.dpi.inpe.br/dev/lccs/' classification-systems
 
 
 The above command will return a list of classification system names as::
@@ -32,21 +32,21 @@ The above command will return a list of classification system names as::
 
 To get more information about a specific classification system, use the ``classification-systems-describe`` command::
 
-    lccs --url 'http://brazildatacube.dpi.inpe.br/dev/lccs/' classification-systems-describe --system_name 'PRODES-1.0'
+    lccs --url 'https://brazildatacube.dpi.inpe.br/dev/lccs/' classification-systems-description --system_name 'PRODES-1.0'
 
 Output::
 
         - authority_name: Projeto de Mapeamento Anual da Cobertura e Uso do Solo no Brasil (MapBiomas)
         - description: O Projeto de Mapeamento Anual da Cobertura e Uso do Solo do Brasil é uma iniciativa que envolve uma rede colaborativa com especialistas nos biomas, usos da terra, sensoriamento remoto, SIG e ciência da computação que utiliza processamento em nuvem e classificadores automatizados desenvolvidos e operados a partir da plataforma Google Earth Engine para gerar uma série histórica de mapas anuais de cobertura e uso da terra do Brasil.
         - id: 32
-        - links: [{'href': 'http://brazildatacube.dpi.inpe.br/dev/lccs/classification_system', 'rel': 'parent', 'title': 'Link to this document', 'type': 'application/json'}, ..]
+        - links: [{'href': 'https://brazildatacube.dpi.inpe.br/dev/lccs/classification_system', 'rel': 'parent', 'title': 'Link to this document', 'type': 'application/json'}, ..]
         - name: Mapbiomas5
         - version: 5
 
 
 List the available classes of a classification system, use the ``classes`` command::
 
-    lccs --url 'http://brazildatacube.dpi.inpe.br/dev/lccs/' classes --system_name 'PRODES-1.0'
+    lccs --url 'https://brazildatacube.dpi.inpe.br/dev/lccs/' classes --system_name 'PRODES-1.0'
 
 The above command will return a list of classes of PRODES as::
 
@@ -59,21 +59,21 @@ The above command will return a list of classes of PRODES as::
 
 To get more information about a specific class, use the ``class-describe`` command::
 
-    lccs --url 'http://brazildatacube.dpi.inpe.br/dev/lccs/' class-describe --system_name 'PRODES-1.0' --class_name 'Desflorestamento'
+    lccs --url 'https://brazildatacube.dpi.inpe.br/dev/lccs/' class-describe --system_name 'PRODES-1.0' --class_name 'Desflorestamento'
 
 The above command will return a::
 
     - classification_system_id: 1
     - code: DESFLORESTAMENTO
     - description:
     - id: 1
-    - links: [[{'href': 'http://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/1/classes/1', 'rel': 'self', 'title': 'Link to this document', 'type': 'application/json'},...]
+    - links: [[{'href': 'https://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/1/classes/1', 'rel': 'self', 'title': 'Link to this document', 'type': 'application/json'},...]
     - name: Desflorestamento
 
 
 Retrieve all available classification system mappings, use the ``available-mappings`` command::
 
-    lccs --url 'http://brazildatacube.dpi.inpe.br/dev/lccs/' available-mappings --system_name_source 'TerraClass_AMZ'
+    lccs --url 'https://brazildatacube.dpi.inpe.br/dev/lccs/' available-mappings --system_name_source 'TerraClass_AMZ'
 
 The above command will return a list of classification systems as::
 
@@ -82,15 +82,15 @@ The above command will return a list of classification systems as::
 
 To get a mapping between classification systems, use the ``mappings`` command::
 
-    lccs --url 'http://brazildatacube.dpi.inpe.br/dev/lccs/' mappings --system_id_source 'TerraClass_AMZ' --system_id_target 'PRODES'
+    lccs --url 'https://brazildatacube.dpi.inpe.br/dev/lccs/' mappings --system_id_source 'TerraClass_AMZ' --system_id_target 'PRODES'
 
 
 Output::
 
     Classification Source: TerraClass_AMZ
     Classification Target: PRODES
-    {'degree_of_similarity': 1.0, 'description': '', 'links': [{'href': 'http://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Agricultura Anual', 'rel': 'item', 'title': 'Link to the source class', 'type': 'application/json'}, {'href': 'http://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Desmatamento', 'rel': 'item', 'title': 'Link to target class', 'type': 'application/json'}], 'source': 'Agricultura Anual', 'source_id': 85, 'target': 'Desmatamento', 'target_id': 175}
-    {'degree_of_similarity': 1.0, 'description': '', 'links': [{'href': 'http://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Área Não Observada', 'rel': 'item', 'title': 'Link to the source class', 'type': 'application/json'}, {'href': 'http://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Nuvem', 'rel': 'item', 'title': 'Link to target class', 'type': 'application/json'}], 'source': 'Área Não Observada', 'source_id': 86, 'target': 'Nuvem', 'target_id': 179}
+    {'degree_of_similarity': 1.0, 'description': '', 'links': [{'href': 'https://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Agricultura Anual', 'rel': 'item', 'title': 'Link to the source class', 'type': 'application/json'}, {'href': 'https://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Desmatamento', 'rel': 'item', 'title': 'Link to target class', 'type': 'application/json'}], 'source': 'Agricultura Anual', 'source_id': 85, 'target': 'Desmatamento', 'target_id': 175}
+    {'degree_of_similarity': 1.0, 'description': '', 'links': [{'href': 'https://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Área Não Observada', 'rel': 'item', 'title': 'Link to the source class', 'type': 'application/json'}, {'href': 'https://brazildatacube.dpi.inpe.br/dev/lccs/classification_system/TerraClass_AMZ/classes/Nuvem', 'rel': 'item', 'title': 'Link to target class', 'type': 'application/json'}], 'source': 'Área Não Observada', 'source_id': 86, 'target': 'Nuvem', 'target_id': 179}
 
 .. note::
 

examples/class_metadata.py

@@ -17,8 +17,7 @@
 classification_system = service.classification_system('PRODES-1.0')
 
 # Return the metadata of a specific class
-class_metadata = classification_system.get_class('Desflorestamento')
-print(class_metadata)
+class_metadata = classification_system.classes('Desmatamento')
 
 # You can access specific attributes
 print(class_metadata.id)

examples/classes.py

@@ -17,6 +17,6 @@
 classification_system = service.classification_system('PRODES-1.0')
 
 # Returns all classes belonging to a specific classification system.
-classes = classification_system.classes
+classes = classification_system.classes()
 print(classes)
 

examples/ex-01.py

@@ -27,12 +27,12 @@
 print(class_system.name)
 
 # Return a classes of a classification system
-classes = class_system.classes
+classes = class_system.classes()
 for i in classes:
     print(i.name)
 
 # Return a specific class of a classification system
-prodes_desflorestamento = class_system.get_class('Desflorestamento')
+prodes_desflorestamento = class_system.classes('Desmatamento')
 print(prodes_desflorestamento.name)
 
 # Get all available mappings for a specific classification system

lccs/class_system.py

@@ -23,7 +23,7 @@ def __init__(self, data, validate=False):
         """
         self._validate = validate
         super(ClassificationSystem, self).__init__(data or {})
-        self._get_classes()
+        self['classes'] = dict()
 
     @property
     def links(self):
@@ -55,27 +55,27 @@ def authority_name(self):
         """:return: authority_name of classification system."""
         return self['authority_name']
 
-    @property
-    def classes(self):
+    def classes(self, class_name=None):
         """:return: classes of the classification system."""
-        return self['classes']
-
-    def get_class(self, class_name):
-        """:return: a specif class of of the classification system."""
-        for i in self.classes:
-            if i.name == class_name:
-                return ClassificationSystemClass(i, self._validate)
-
-    def _get_classes(self, filter=None):
-        """:return: get classes of the classification system.."""
-        classes = list()
-        for link in self['links']:
-            if link['rel'] == 'classes':
-                data = Utils._get(link['href'], params=filter)
-                for i in data:
-                    if 'rel' in i and i['rel'] == 'child':
-                        classes.append(ClassificationSystemClass(Utils._get(i['href'], self._validate), self._validate))
-        self['classes'] = classes
+        return self._get_classes(class_name)
+
+    def _get_classes(self, class_name):
+        """:return: get classes of the classification system."""
+        if not bool(self['classes']):
+            self._classes_links = next(Utils._get(link['href']) for link in self['links'] if link['rel'] == 'classes')
+
+            for i in self._classes_links:
+                if i['rel'] == 'child':
+                    class_data = ClassificationSystemClass(Utils._get(i['href'], self._validate), self._validate)
+                    if 'class_parent_id' in class_data:
+                        parent_class_uri = i['href'].rsplit('/', maxsplit=1)[0] + f'/{class_data.class_parent_id}'
+                        class_data['class_parent_name'] = ClassificationSystemClass(Utils._get(parent_class_uri)).name
+                    self['classes'][f"{class_data.name}"] = class_data
+
+        if class_name is not None:
+            return self['classes'][f'{class_name}'] if class_name in self['classes'].keys() else {}
+
+        return self['classes'].values()
 
     def _repr_html_(self):
         """HTML repr."""

lccs/classes.py

@@ -43,5 +43,10 @@ def code(self):
 
     @property
     def class_parent_id(self):
-        """:return: the class code."""
-        return self['class_parent_id']
+        """:return: the class parent id."""
+        return self['class_parent_id'] if 'class_parent_id' in self else None
+
+    @property
+    def class_parent_name(self):
+        """:return: the class parent name."""
+        return self['class_parent_name'] if 'class_parent_name' in self else None