ea-area_lookup 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489adaa9dec03f4ed5d04c3fb0513d5a30e5c43c
-  data.tar.gz: 95b150f658536a2c3c35ae0667106f4cdf6bd5ab
+  metadata.gz: be99b0c83704e166b6c0d61131c11695e35c1771
+  data.tar.gz: 18d26c91a81a300752ea23403784222ce167aa48
 SHA512:
-  metadata.gz: dae7204cdc60f6a3d455af74e7cf1633b75f36f76fec7546600095e949f4eb9c93da8e2a038c38acd3a32805307f1008e0d6d44b4be624673837b05a83c820f1
-  data.tar.gz: ec8c54133e198420a11653d45980a62455ab9d8f87b16c24ca18e857bf79fcc8acb8d8a07b4041ed330ce3d0a4639f9863a4cc1ad284d4365b8cafc09bd182ae
+  metadata.gz: 0ef9beda87b4414e3439a36afb5cc052dabb0b067435ddbbc5731cbc5f7a9283677e06da30c9d06150de0511a0bd0fc3a2f8483626f24626f124fa4a13c6d8b6
+  data.tar.gz: 039e95846368aba23844d98038022de068f88ba481f19976dee60d57ebd330054c3f9cc1dca8e4fe8fc830978a4623252c0d3adf88248dec8c9de002bcfdfc8c

data/README.md

@@ -31,7 +31,7 @@ Create an intializer e.g. `config/initializers/area_lookup.rb`
 
 ```ruby
 EA::AreaLookup.configure do |config|
-  config.administrative_area_api_url = "http://admin-area-api-base-url"
+  config.area_api_url = "http://admin-area-api-base-url"
 end
 ```
 
@@ -40,7 +40,8 @@ Now you can do the following
 ```ruby
 coords = EA::AreaLookup::Coordinates.new(easting: 123, northing: 456)
 (or EA::AreaLookup::Coordinates.new(x: 123, y: 456))
-result = EA::AreaLookup.find_by_coordinates(coords)
+result = EA::AreaLookup.find_admin_area_by_coordinates(coords)
+# or result = EA::AreaLookup.find_water_management_area_by_coordinates(coords)
 p result
 => {:area_id=>"XX", :code=>"WESSEX", :area_name=>"Wessex", :short_name=>"Wessex", :long_name=>"Wessex"}
 ```

data/lib/ea/area_lookup/configuration.rb

@@ -1,10 +1,10 @@
 module EA
   module AreaLookup
     class Configuration
-      attr_accessor :administrative_area_api_url
+      attr_accessor :area_api_url
 
       def initialize
-        @administrative_area_api_url ||= "http://environment.data.gov.uk/ds/wfs"
+        @area_api_url ||= "http://environment.data.gov.uk/ds/wfs"
       end
     end
 

data/lib/ea/area_lookup/finders.rb

@@ -4,11 +4,21 @@ require "open-uri"
 module EA
   module AreaLookup
     module Finders
-      def find_by_coordinates(coords)
+
+      def find_admin_area_by_coordinates(coords)
         validate_config!
         return nil unless coords && coords.valid?
-        xml = fetch_admin_area_from_api(coords)
-        parse_xml(xml)
+        typename = "ea-wfs-area_public_face_inspire"
+        xml = fetch_area_from_api(coords, typename)
+        parse_xml(xml, typename)
+      end
+
+      def find_water_management_area_by_coordinates(coords)
+        validate_config!
+        return nil unless coords && coords.valid?
+        typename = "ea-wfs-area_water_management_inspire"
+        xml = fetch_area_from_api(coords, typename)
+        parse_xml(xml, typename)
       end
 
       private
@@ -20,22 +30,25 @@ module EA
         REQUEST: "GetFeature",
         MSVER: 6,
         SRS: "EPSG:27700",
-        TYPENAME: "ea-wfs-area_public_face_inspire",
+
         propertyName: "long_name,short_name,code,area_id,area_name",
         Filter: ""
       }.freeze
 
       def api_url
-        EA::AreaLookup.config.administrative_area_api_url
+        EA::AreaLookup.config.area_api_url
       end
 
       def validate_config!
         return if api_url
-        raise EA::AreaLookup::InvalidConfigError, "Missing administrative_area_api_url"
+        raise EA::AreaLookup::InvalidConfigError, "Missing area_api_url"
       end
 
-      def fetch_admin_area_from_api(coords)
-        params = DEFAULT_API_PARAMS.merge(Filter: "(#{filter_xml(coords)})")
+      def fetch_area_from_api(coords, typename)
+        params = DEFAULT_API_PARAMS
+                 .merge(Filter: "(#{filter_xml(coords)})")
+                 .merge(TYPENAME: typename)
+
         full_url = %(#{api_url}?#{params.map { |k, v| "#{k}=#{v}" }.join('&')})
         open full_url, proxy: ENV["http_proxy"]
       rescue => e
@@ -50,12 +63,12 @@ module EA
         "</Intersects></Filter>"
       end
 
-      def parse_xml(response)
+      def parse_xml(response, typename)
         xml = Nokogiri::XML response
         validate_xml(xml)
 
         result = %i(area_id code area_name short_name long_name).each_with_object({}) do |path, hash|
-          hash[path] = xml.xpath("//gml:featureMember/ms:ea-wfs-area_public_face_inspire/ms:#{path}").text
+          hash[path] = xml.xpath("//gml:featureMember/ms:#{typename}/ms:#{path}").text
         end
         result.tap { |h| EA::AreaLookup.logger.debug(h) }
       end

data/lib/ea/area_lookup/version.rb

@@ -1,5 +1,5 @@
 module EA
   module AreaLookup
-    VERSION = "0.1.2".freeze
+    VERSION = "0.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea-area_lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Digital Services Team, EnvironmentAgency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri