Merge pull request #66 from fabianazioti/improves09

adding support for multiple layers

Author: raphaelrpl

wlts/__init__.py

@@ -46,8 +46,16 @@ def handle_exception(e):
         return {'code': InternalServerError.code,
                 'description': InternalServerError.description}, InternalServerError.code
 
-    from .views import bp
+    @app.after_request
+    def after_request(response):
+        """Enable CORS."""
+        response.headers.add('Access-Control-Allow-Origin', '*')
+        response.headers.add('Access-Control-Allow-Methods', '*')
+        response.headers.add('Access-Control-Allow-Headers',
+                             'Origin, X-Requested-With, Content-Type, Accept, Authorization')
+        return response
 
+    from .views import bp
     app.register_blueprint(bp)
 
 

wlts/collections/collection.py

@@ -15,7 +15,7 @@ class Collection(metaclass=ABCMeta):
     """Abstract class to represent an collection."""
 
     def __init__(self, name, authority_name, description, detail, datasource_id, dataset_type,
-                 classification_class, temporal, scala, spatial_extent, period, is_public):
+                 classification_class, temporal, scala, spatial_extent, period, is_public, deprecated):
         """Create Collection."""
         self.name = name
         self.authority_name = authority_name
@@ -27,6 +27,7 @@ def __init__(self, name, authority_name, description, detail, datasource_id, dat
         self.spatial_extent = spatial_extent
         self.period = period
         self.is_public = is_public
+        self.deprecated = deprecated
         self.classification_class = self.create_classification_system(classification_class)
 
         self.datasource = datasource_manager.get_datasource(datasource_id)

wlts/collections/feature_collection.py

@@ -30,9 +30,10 @@ def __init__(self, collections_info):
                          collections_info["scala"],
                          collections_info["spatial_extent"],
                          collections_info["period"],
-                         collections_info["is_public"])
+                         collections_info["is_public"],
+                         collections_info["deprecated"],
+                         )
 
-        self.feature_name = collections_info["feature_name"]
         self.geom_property = collections_info["geom_property"]
         self.observations_properties = collections_info["observations_properties"]
 
@@ -59,7 +60,6 @@ def trajectory(self, tj_attr, x, y, start_date, end_date, geometry):
         for obs in self.observations_properties:
 
             args = {
-                "feature_name": self.feature_name,
                 "temporal": self.temporal,
                 "x": x,
                 "y": y,

wlts/collections/image_collection.py

@@ -29,9 +29,9 @@ def __init__(self, collections_info):
                          collections_info["scala"],
                          collections_info["spatial_extent"],
                          collections_info["period"],
-                         collections_info["is_public"])
+                         collections_info["is_public"],
+                         collections_info["deprecated"])
 
-        self.image = collections_info["image"]
         self.grid = collections_info["grid"]
         self.spatial_ref_system = collections_info["spatial_reference_system"]
         self.observations_properties = collections_info["attributes_properties"]
@@ -58,23 +58,24 @@ def trajectory(self, tj_attr, x, y, start_date, end_date, geometry):
         ds = self.get_datasource()
 
         for time in self.timeline:
-            args = {
-                "image": self.image,
-                "temporal": self.temporal,
-                "x": x,
-                "y": y,
-                "grid": self.grid,
-                "srid": self.spatial_ref_system["srid"],
-                "start_date": start_date,
-                "end_date": end_date,
-                "time": time,
-                "classification_class": self.classification_class,
-                "geometry_flag": geometry
-            }
+            for att in self.observations_properties:
+                args = {
+                    "image": att["image"],
+                    "temporal": self.temporal,
+                    "x": x,
+                    "y": y,
+                    "grid": self.grid,
+                    "srid": self.spatial_ref_system["srid"],
+                    "start_date": start_date,
+                    "end_date": end_date,
+                    "time": time,
+                    "classification_class": self.classification_class,
+                    "geometry_flag": geometry
+                }
 
-            result = ds.get_trajectory(**args)
-            
-            if result is not None:
-                result["collection"] = self.get_name()
-                tj_attr.append(result)
+                result = ds.get_trajectory(**args)
+
+                if result is not None:
+                    result["collection"] = self.get_name()
+                    tj_attr.append(result)
 

wlts/controller.py

@@ -81,6 +81,8 @@ def describe_collection(cls, collection_name, roles=None):
             describe["name"] = collection.name
             describe["description"] = collection.description
             describe["detail"] = collection.detail
+            describe["is_public"] = collection.is_public
+            describe["deprecated"] = collection.deprecated
             describe["collection_type"] = collection.collection_type()
             describe["resolution_unit"] = {
                 "unit": collection.get_resolution_unit(),

wlts/datasources/wfs.py

@@ -247,14 +247,14 @@ def organize_trajectory(self, result, obs, geom_flag, geom_property, classificat
 
     def get_trajectory(self, **kwargs):
         """Return a trajectory observation of this datasource."""
-        invalid_parameters = set(kwargs) - {"feature_name", "temporal",
+        invalid_parameters = set(kwargs) - {"temporal",
                                             "x", "y", "obs", "geom_property",
                                             "classification_class", "start_date", "end_date",
                                             "geometry_flag"}
         if invalid_parameters:
             raise AttributeError('invalid parameter(s): {}'.format(invalid_parameters))
 
-        type_name = self.workspace + ":" + kwargs['feature_name']
+        type_name = self.workspace + ":" + (kwargs['obs'])['feature_name']
 
         geom = Point(kwargs['x'], kwargs['y'])
 

wlts/json_configs/feature_collection/deter_amz.json

@@ -5,6 +5,7 @@
     "detail": "http://www.obt.inpe.br/OBT/assuntos/programas/amazonia/deter",
     "datasource_id": "3c20cbb4-ca94-4c1f-99af-6377f30bc683",
     "dataset_type": "Feature",
+    "deprecated": false,
     "is_public": true,
     "classification_class": {
       "datasource_id": "3c20cbb4-ca94-4c1f-99af-6377f30bc683",
@@ -29,15 +30,14 @@
       "ymin": -18.0364406523564,
       "ymax": 4.55537642867927
     },
-    "feature_name": "deter_amz",
-    "feature_id_property": "gid",
     "geom_property": {
       "property_name": "geom",
       "srid": 4674,
       "type": "MultiPolygon"
     },
     "observations_properties": [
       {
+        "feature_name": "deter_amz",
         "class_property": "classname",
         "temporal_property": "view_date"
       }

wlts/json_configs/image_collection/terraclass_cerrado.json

@@ -5,6 +5,7 @@
   "detail": "Para mais informacoes acesse: https://www.terraclass.gov.br/",
   "datasource_id": "3c20cbb4-ca94-4c1f-99af-6377f30bc644",
   "dataset_type": "Image",
+  "deprecated": false,
   "is_public": true,
   "classification_class": {
     "datasource_id": "3c20cbb4-ca94-4c1f-99af-6377f30bc644",
@@ -29,7 +30,6 @@
     "max_x": "-41.522427616",
     "max_y": "-2.32678430299999"
   },
-  "image": "tc_cerrado_2018_raster",
   "grid": {
     "row": "768",
     "column": "638"
@@ -39,6 +39,7 @@
   },
   "attributes_properties": [
     {
+      "image": "tc_cerrado_2018_raster",
       "name": "GRAY_INDEX",
       "data_type": "int",
       "valid_range": {

wlts/version.py

@@ -13,4 +13,4 @@
 """
 
 
-__version__ = '0.8.0'
+__version__ = '0.9.0'