knmi 0.1.3 → 0.1.4

data/README.rdoc

@@ -25,6 +25,49 @@ Please Note the disclaimer included in the header!
 = Dependancies
 * httparty >= 0.7.4
 
+= Data
+Please note that the data must be converted from fixnum to float, I will include a method to take care of this in my next version.
+
+	YYYYMMDD = Date (YYYY=year MM=month DD=day)
+	DDVEC    = Vector mean wind direction in degrees (360=north, 90=east, 180=south, 270=west, 0=calm/variable)
+	FHVEC    = Vector mean windspeed (in 0.1 m/s)
+	FG       = Daily mean windspeed (in 0.1 m/s)
+	FHX      = Maximum hourly mean windspeed (in 0.1 m/s)
+	FHXH     = Hourly division in which FHX was measured
+	FHN      = Minimum hourly mean windspeed (in 0.1 m/s)
+	FHNH     = Hourly division in which FHN was measured
+	FXX      = Maximum wind gust (in 0.1 m/s)
+	FXXH     = Hourly division in which FXX was measured
+	TG       = Daily mean temperature in (0.1 degrees Celsius)
+	TN       = Minimum temperature (in 0.1 degrees Celsius)
+	TNH      = Hourly division in which TN was measured
+	TX       = Maximum temperature (in 0.1 degrees Celsius)
+	TXH      = Hourly division in which TX was measured
+	T10N     = Minimum temperature at 10 cm above surface (in 0.1 degrees Celsius)
+	T10NH    = 6-hourly division in which T10N was measured; 6=0-6 UT, 12=6-12 UT, 18=12-18 UT, 24=18-24 
+	SQ       = Sunshine duration (in 0.1 hour) calculated from global radiation (-1 for <0.05 hour)
+	SP       = Percentage of maximum potential sunshine duration
+	Q        = Global radiation (in J/cm2)
+	DR       = Precipitation duration (in 0.1 hour)
+	RH       = Daily precipitation amount (in 0.1 mm) (-1 for <0.05 mm)
+	RHX      = Maximum hourly precipitation amount (in 0.1 mm) (-1 for <0.05 mm)
+	RHXH     = Hourly division in which RHX was measured
+	PG       = Daily mean sea level pressure (in 0.1 hPa) calculated from 24 hourly values
+	PX       = Maximum hourly sea level pressure (in 0.1 hPa)
+	PXH      = Hourly division in which PX was measured
+	PN       = Minimum hourly sea level pressure (in 0.1 hPa)
+	PNH      = Hourly division in which PN was measured
+	VVN      = Minimum visibility; 0: <100 m, 1:100-200 m, 2:200-300 m,..., 49:4900-5000 m, 50:5-6 km, 56:6-7 km, 57:7-8 km,..., 79:29-30 km, 80:30-35 km, 81:35-40 km,..., 89: >70 k
+	VVNH     = Hourly division in which VVN was measured
+	VVX      = Maximum visibility; 0: <100 m, 1:100-200 m, 2:200-300 m,..., 49:4900-5000 m, 50:5-6 km, 56:6-7 km, 57:7-8 km,..., 79:29-30 km, 80:30-35 km, 81:35-40 km,..., 89: >70 k
+	VVXH     = Hourly division in which VVX was measured
+	NG       = Mean daily cloud cover (in octants, 9=sky invisible)
+	UG       = Daily mean relative atmospheric humidity (in percents)
+	UX       = Maximum relative atmospheric humidity (in percents)
+	UXH      = Hourly division in which UX was measured
+	UN       = Minimum relative atmospheric humidity (in percents)
+	UNH      = Hourly division in which UN was measured
+	EV24     =  Potential evapotranspiration (Makkink) (in 0.1 mm
 
 = List of Recorded Parameters and group name
 When entering parameters in method call use groupname for collection of variables of use individual parameter names

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/knmi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knmi}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bullfight"]
-  s.date = %q{2011-04-28}
+  s.date = %q{2011-05-02}
   s.description = %q{A set of methods to query the KNMI HTTP get form for daily climate data and select a variety of measured parameters, from available stations, in a json style array of hashes, and if necessary convert to csv.}
   s.email = %q{p.schmitz@gmail.com}
   s.extra_rdoc_files = [

data/lib/knmi.rb

@@ -101,18 +101,35 @@ class KNMI
     #varlist = res[(7+nstn)..(6 + nstn + nvars)]
     #colheader = res[(8 + nstn + nvars)]
     #header = res[0..(9 + nstn + nvars)]
-    #stations = res[5..(4+nstn)]
-    #stations = stations.join.tr("\s+", "")
-    #stations = stations.tr("#", "")
-    #stations = stations.tr(":", "")
-    #stations = CSV.parse( stations, {:col_sep => "\t"} )
     def parse(response, station_number, vars)
       # Line Index Numbers
       nstn = [station_number].flatten.length
       vars, nvars = check_variables(vars)
-
-      # Clean Data remove unecessary chars
+      
+      # Split lines into array
       response = response.split(/\n/)
+
+      # Get Station Details
+      stations = response[5..(4+nstn)]
+      stations = stations.join.tr("\t", "\s")
+      stations = stations.tr("#", "")
+      stations = stations.tr(":", "")
+      stations = CSV.parse( stations, {:col_sep => "\s"} )
+      stations = stations.map {|row| row.map {|cell| cell.to_s } }
+      st_header = [:station_code, :lng, :lat, :elev, :name]
+      stations = stations.map {|row| Hash[*st_header.zip(row).flatten] }
+
+      # Get Variable Details
+      varlist = response[(7+nstn)..(6 + nstn + nvars)]
+      varlist = varlist.join
+      varlist = varlist.gsub(/# /, "")
+      varlist = varlist.gsub(/\s{2,}/, "")
+      varlist = varlist.gsub(/;/, "\r")
+      varlist = CSV.parse( varlist, {:col_sep => "= "} )
+      vr_header = [:var, :description]
+      varlist = varlist.map {|row| Hash[*vr_header.zip(row).flatten] }
+
+      # Get and clean data
       response = response[(8 + nstn + nvars)..response.length]
       response = response.join.tr("\s+", "")
       response = response.tr("#", "")
@@ -123,6 +140,7 @@ class KNMI
       string_data = response.map {|row| row.map {|cell| cell.to_s } }
       data = string_data.map {|row| Hash[*header.zip(row).flatten] }
 
+      return {:stations => stations, :variables => varlist, :data => data}
     end
   end # End Private
    
@@ -133,6 +151,7 @@ class KNMI
   # station_number = [210, 212]
   # vars = "TG"
   # res = KNMIdaily.get_station( station_number, vars )
+  # output {:stations => {:}}
   def self.get_station(station_number, vars = "")
     query = station(station_number) + "&" + variables(vars)
     puts query 
@@ -172,6 +191,7 @@ class KNMI
   
   def self.to_csv(filename, response)
     CSV.open(filename, "wb") do |csv|
+      response[:data]
       csv << response[0].keys
       response[(1..(response.length - 1))].each do |line|
         csv << line.values

metadata

@@ -2,7 +2,7 @@
 name: knmi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - bullfight
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3006710400801568516
+      hash: -3374246845192166730
       segments: 
       - 0
       version: "0"