Merge branch 'release-0.1.0'

Author: Ferdinando Primerano

CHANGELOG.md

@@ -0,0 +1,10 @@
+### 0.1.0
+
+**Add new fields to Protected Areas JSON**
+
+* Added governance
+* Added no_take_status area
+* Added reported_area
+* Added reported_marine_area
+* Added owner_type
+* Improved documentation

api/v3/views/protected_area.rabl

@@ -16,21 +16,15 @@ if @current_user.access_to?(ProtectedArea, :geometry)
 end
 
 if @current_user.access_to?(ProtectedArea, :marine)
-  node :marine do |pa|
-    pa.marine
-  end
+  attribute :marine
 end
 
 if @current_user.access_to?(ProtectedArea, :reported_marine_area)
-  node :reported_marine_area do |pa|
-    pa.reported_marine_area
-  end
+  attribute :reported_marine_area
 end
 
 if @current_user.access_to?(ProtectedArea, :reported_area)
-  node :reported_area do |pa|
-    pa.reported_area
-  end
+  attribute :reported_area
 end
 
 if @current_user.access_to?(ProtectedArea, :legal_status_updated_at)
@@ -40,15 +34,11 @@ if @current_user.access_to?(ProtectedArea, :legal_status_updated_at)
 end
 
 if @current_user.access_to?(ProtectedArea, :management_plan)
-  node :management_plan do |pa|
-    pa.management_plan
-  end
+  attribute :management_plan
 end
 
 if @current_user.access_to?(ProtectedArea, :is_green_list)
-  node :is_green_list do |pa|
-    pa.is_green_list
-  end
+  attribute :is_green_list
 end
 
 # Relations
@@ -82,7 +72,7 @@ end
 
 if @current_user.access_to?(ProtectedArea, :no_take_status)
   child :no_take_status, object_root: false do
-    attributes :id, :name
+    attributes :id, :name, :area
   end
 end
 
@@ -97,3 +87,13 @@ if @current_user.access_to?(ProtectedArea, :management_authority)
     attributes :id, :name
   end
 end
+
+if @current_user.access_to?(ProtectedArea, :governance)
+  child :governance, object_root: false do
+    attributes :id, :governance_type
+  end
+end
+
+if @current_user.access_to?(ProtectedArea, :owner_type)
+  attribute :owner_type
+end

models/protected_area.rb

@@ -13,7 +13,9 @@ class ProtectedArea < ActiveRecord::Base
     :iucn_category, :designation,
     :link_to_pp, :no_take_status,
     :legal_status, :legal_status_updated_at,
-    :management_plan, :management_authority
+    :management_plan, :management_authority,
+    :governance, :reported_area, :reported_marine_area,
+    :owner_type
   ]
 
   belongs_to :iucn_category

web/views/documentation/protected_areas.md

@@ -52,7 +52,22 @@ Sample response:
                   name: "National"
                 }
             },
-            "marine": false
+            "no_take_status": {
+              id: 11851,
+              name: "Not Applicable",
+              area: "0.0"
+            }
+            "marine": false,
+            "reported_area": "0.3933",
+            "reported_marine_area": "0.0",
+            "legal_status_updated_at": "01/01/1998",
+            "management_plan": "Not Reported",
+            "is_green_list": false,
+            "governance": {
+              "id": 1,
+              "governance_type": "Governance by Government"
+            },
+            "owner_type": "Not Reported"
         },
         {
             "id": 64700,
@@ -83,8 +98,9 @@ Sample response:
                 }
             },
             "no_take_status": {
-              "id": 11874,
-              "name": "Not Applicable"
+              "id": 13537,
+              "name": "Not Applicable",
+              "area": "0.0"
             },
             "legal_status": {
               "id": 1,
@@ -95,9 +111,16 @@ Sample response:
               "name": "Not Reported"
             },
             "marine": false,
-            "legal_status_updated_at": "01/01/1998",
+            "reported_area": "5.1867",
+            "reported_marine_area": "0.0",
+            "legal_status_updated_at": "01/01/1948",
             "management_plan": "Not Reported",
-            "is_green_list": false
+            "is_green_list": false,
+            "governance": {
+              "id": 1,
+              "governance_type": "Governance by Government"
+            },
+            "owner_type": "Not Reported"
         }
     ]
 }
@@ -173,7 +196,8 @@ Sample response:
         },
         "no_take_status": {
           "id": 11874,
-          "name": "Not Applicable"
+          "name": "Not Applicable",
+          "area": "0.0"
         },
         "legal_status": {
           "id": 1,
@@ -184,9 +208,16 @@ Sample response:
           "name": "Not Reported"
         },
         "marine": false,
+        "reported_area": "106.25",
+        "reported_marine_area": "0.0",
         "legal_status_updated_at": "01/01/1998",
         "management_plan": "Not Reported",
-        "is_green_list": false
+        "is_green_list": false,
+        "governance": {
+          "id": 1,
+          "governance_type": "Governance by Government"
+        },
+        "owner_type": "Not Reported"
     }
 }
 ~~~
@@ -305,8 +336,9 @@ Sample response:
                 }
             },
             "no_take_status": {
-              "id": 11874,
+              "id": 2634,
               "name": "Not Applicable"
+              "area": "0.0"
             },
             "legal_status": {
               "id": 1,
@@ -317,9 +349,16 @@ Sample response:
               "name": "Not Reported"
             },
             "marine": false,
-            "legal_status_updated_at": "01/01/1998",
+            "reported_area": "230.46",
+            "reported_marine_area": "46.66",
+            "legal_status_updated_at": "01/01/1977",
             "management_plan": "Not Reported",
-            "is_green_list": false
+            "is_green_list": false,
+            "governance": {
+              "id": 2,
+              "governance_type": "Not Reported"
+            },
+            "owner_type: "Not Reported"
         }
     ]
 }