Merge pull request #256 from MAPC/develop

Version 1.0.9
MAPC · Aug 13, 2018 · 0c96ef9 · 0c96ef9
2 parents 414abe4 + e9d5648
commit 0c96ef9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/rails/app/models/development.rb b/rails/app/models/development.rb
@@ -108,7 +108,7 @@ def geocode
     if result && JSON.parse(result.body)['features'].length > 0
       properties = JSON.parse(result.body)['features'][0]['properties']
       self.update_columns(
-        municipal: properties['locality'],
+        municipal: (properties['locality'] || properties['localadmin']),
         address: properties['name'],
         zip_code: properties['postalcode']
       )

diff --git a/rails/app/policies/development_policy.rb b/rails/app/policies/development_policy.rb
@@ -8,7 +8,7 @@ def show?
   end
 
   def create?
-    !user&.disabled? && (user&.admin? || user&.verified? || (user&.municipal? && (record.municipal == user.municipality)))
+    !user&.disabled? && (user&.admin? || user&.verified? || (user&.municipal? && (record.municipal == user.municipality || get_municipality(record) == user.municipality)))
   end
 
   def update?
@@ -22,4 +22,15 @@ def update?
   def destroy?
     !user&.disabled? && (user&.admin? || (user&.municipal? && (record.municipal == user.municipality)))
   end
+
+  private
+
+  def get_municipality(record)
+    result = Faraday.get "https://pelias.mapc.org/v1/reverse?point.lat=#{record.latitude}&point.lon=#{record.longitude}"
+    if result && JSON.parse(result.body)['features'].length > 0
+      properties = JSON.parse(result.body)['features'][0]['properties']
+      return (properties['locality'] || properties['localadmin'])
+    end
+  end
+
 end