jekyll-geocode 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a800dd5ba8b97233bf43ad3cb8e47ba0dd2b7f4
-  data.tar.gz: 0dcf7e2d742bfeec6e1174ac6ec8e7cde0a7ae55
+  metadata.gz: 865de4a807502167c5b10544e8a0e11bace6aced
+  data.tar.gz: 521cd82b9052eb92b35175dc60a8f9da5a7be517
 SHA512:
-  metadata.gz: c448b250b9aa67f690f8613cb459bf8557a6180d98e41aba159fe8ef7f9c979f7949014d8a562843fe4e6c9e1ed063007b3fbbc5b2fb2152773c2df87f792051
-  data.tar.gz: 8a3ca5bef05ccc9de67de4c8d4eeba1f6306a37804f8a284ee81e267210d594a2e032dcce029479929f856bebaf6d86265f7e8994e1ee20d22f3d0609b82b2f1
+  metadata.gz: 8865d2f87f4cc5a2def825745e4cb0578ed4b36ebe5a5643b42fc5b28cc99d80e864526b8fb03f8d904a545c6b74ff26493338982096f36698193f082cea4f78
+  data.tar.gz: 7041189666286518b889ba6a523a5204433409d05d0292ec8cffc2893219b54cbd82fa62efd807ddb6e551679980c8437c76ea6f40965035fcf5b1cdc2e29014

data/README.md

@@ -12,17 +12,23 @@ I took the [Nominatim](https://nominatim.openstreetmap.org/) open source service
 ## Example of YAML : _data/members.yml
 
 ```yaml
+- name: "Bertrand Keller"
+  street: "place du vieux marché"
+  postcode: "76000"
+  city: "Rouen"
+  region: "normandy"
+  country: "france" 
 - name: "John Doe"
-  address: "rue Mendès France"
-  postcode: 76190
-  city: "Yvetot"
+  street: "rue Mendès France"
+  postcode: "76190"
+  city: "Yvetot" 
   region: "normandy"
   country: "france"  
 - name: "Samuel Le Bihan"
-  address: "place du général de Gaulle France"
-  postcode: 76000
-  city: "Rouen"
-  region: "Normandy"
+  street: "Place Niemeyer" 
+  city: "Le Havre"
+  postcode: "76600"
+  region: "normandy"
   country: "france"
 ```
 

data/lib/jekyll_geocode.rb

@@ -4,11 +4,15 @@ require 'yaml'
 require 'open-uri'
 require "i18n"
 
-module Jekyll_Get
+module Jekyll_Geocode
   class Generator < Jekyll::Generator
     safe true
     priority :highest
 
+    def request_service(url)
+      JSON.load(open(URI.encode(url)))
+    end
+
     def generate(site)
 
       #regEx for removing empty line
@@ -57,54 +61,76 @@ module Jekyll_Get
 
       # Loop YML file
       members.each do |d|
-        # Test if a JSON file exists for performance issues
-        if !File.file?("#{data_source}/#{d[geo_name]}.json")
-          geo_name_field = d[geo_name].downcase.tr(" ", "-")
-          if d[geo_postcode]
-            geo_postcode_field = ",#{d[geo_postcode]}"
-          end
-          if d[geo_city]
-            geo_city_field = ",#{d[geo_city]}"
-          end
-          if d[geo_region]
-            geo_region_field = ",#{d[geo_region]}"
+        geo_name_field = d[geo_name].downcase.tr(" ", "-")
+        if d[geo_postcode]
+          geo_postcode_field = ", #{d[geo_postcode]}"
+        end
+        if d[geo_city]
+          geo_city_field = ", #{d[geo_city]}"
+        end
+        if d[geo_region]
+          geo_region_field = ", #{d[geo_region]}"
+        end
+        if d[geo_country]
+          geo_country_field = ", #{d[geo_country]}"
+        end
+        geo_coord = "#{d[geo_address]}#{geo_postcode_field}#{geo_city_field}#{geo_region_field}#{geo_country_field}"
+        geo_request = "#{geo_service}#{geo_coord}&limit=1"
+        p geo_request
+
+
+        # Loop for an YML output
+        if outputfile
+
+          # No cache at the first loop
+          geo_cache = true
+
+          # Read the YML file
+          if File.file?(path_yaml)
+            file_yaml = YAML.load(File.open(path_yaml))
           end
-          if d[geo_country]
-            geo_country_field = ",#{d[geo_country]}"
+
+          # If YML file test if and address are the same as in the source file
+          if file_yaml
+            file_yaml.each do |coordinates|
+              if coordinates['address'] == geo_coord
+                geo_cache = false
+              end
+            end
+          else
+            geo_cache = true
           end
-          json = URI.encode("#{geo_service}#{d[geo_address]}#{geo_postcode_field}#{geo_city_field}#{geo_region_field}#{geo_country_field}&limit=1")
-          source = JSON.load(open(json))
 
-          # Loop for an YML output
-          if outputfile
-            source.each do |coordinates|
-              data = [ "title" => "#{d[geo_name]}", "url" => "#places-01", "data_set" => "01", "location" => { "latitude" => "#{coordinates["lat"]}","longitude" => "#{coordinates["lon"]}" } ]
+          # Write data
+          if geo_cache == true
+            p "geocode is requesting #{geo_coord}"
+            request_service(geo_request).each do |coordinates|
+              data = [ "title" => "#{d[geo_name]}", "url" => "##{d[geo_name]}", "data_set" => "01", "location" => { "latitude" => "#{coordinates["lat"]}","longitude" => "#{coordinates["lon"]}" }, "address" => "#{geo_coord}" ]
               data_yml = data.to_yaml
-              # Test if there is any yaml files and create file
+              # Add data in the YML file
               if !File.file?(path_yaml)
                 File.open(path_yaml, "w") {|f| f.write(data_yml) }
               end
-              # Test if there is yaml files and add data recursively
               if File.file?(path_yaml)
                 File.open(path_yaml, 'a') { |f|
-                  data_yml_simple = data_yml.gsub("---", "").gsub(regEx, '')
-                  f.puts data_yml_simple
+                  f.puts data_yml.gsub("---", "").gsub(regEx, '')
                 }
-                # Load YML file and remove duplicate entries
-                file_yaml = YAML.load(File.open(path_yaml))
-                file_yaml_uniq = file_yaml.uniq { |s| s.first }
-                File.open(path_yaml, "w") {|f| f.write(file_yaml_uniq.to_yaml) }
+                # Load YML file => remove duplicated entries
+                file_yaml = YAML.load(File.open(path_yaml)).uniq { |s| s.first }
+                File.open(path_yaml, "w") {|f| f.write(file_yaml.to_yaml) }
               end
             end
-          # Loop for an JSON output
-          else
-            site.data[geo_name_field] = source
-            #Create a JSON  files if cache is enabled
-            if site.config['jekyll_geocode']['cache']
-              path_json = "#{data_source}/#{geo_name_field}.json"
-              open(path_json, 'wb') do |file|
-                file << JSON.generate(site.data[geo_name_field])
-              end
+          end
+        end
+
+        # JSON output :: Test if a JSON file exists for performance issues
+        if !outputfile && !File.file?("#{data_source}/#{d[geo_name]}.json")
+          site.data[geo_name_field] = request_service(geo_request)
+          #Create a JSON  files if cache is enabled
+          if site.config['jekyll_geocode']['cache']
+            path_json = "#{data_source}/#{geo_name_field}.json"
+            open(path_json, 'wb') do |file|
+              file << JSON.generate(site.data[geo_name_field])
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geocode
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Bertrand Keller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll