geosparql_to_geojson 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc5084f15f2da1cc5ef42f4f29aa1f001151d77a
-  data.tar.gz: ae87d6a4f40d7a1502f7155ffe9dfda4552d941b
+  metadata.gz: 8745dbc21bfac65f5e4ff1e9a195d561d9f15d5c
+  data.tar.gz: 3f52ce971cf31c957258a911506ff2c76f714ef8
 SHA512:
-  metadata.gz: 9d0dd1c7732ff288f982b72f3c05060e3d2a55ed73c0e64bb8dd45c57bf5c2360800ba31342455c7257a63dad26922a8a9c575d572c7cb18759c69c994661b6a
-  data.tar.gz: bb1dc96ea5309043a5d9c4df095d76273ba3600b4e77ef65ee0e043e5ae6a547bdd6124013f430e070a607be0376d4a3c13252d59fb5f34aae4affafa292076b
+  metadata.gz: 4614f07cac499f359243bc66a76c952914995a51ca834ffd0fc5f02f5f2ea2c23c298bd18e1a52b12b2dc192572fbeec4563e763f74bf177e122d08915e8909a
+  data.tar.gz: 5c64b4b1db9f453052e9ed53b80bcb034df71d7097cdcf7950e9c405c113a424caff02a71bfe0b0bce66af27110fc2c2fa8e0683541ada4f6cdeb5f1e04aeb9c

data/lib/geosparql_to_geojson/converter.rb

@@ -5,8 +5,19 @@ module GeosparqlToGeojson
   #
   # @since 0.1.0
   class Converter
-    # Constant contains every GeoSparql data type.
-    GEOMETRY_TYPES = %w[Point Multipoint LineString Multiline Polygon MultiPolygon GeometryCollection].freeze
+    # Constant containing hash of GeoSparql types and the correctly formatted version.
+    GEOSPARQL_TYPES = {
+      polygon:            :Polygon,
+      point:              :Point,
+      multipoint:         :MultiPoint,
+      linestring:         :LineString,
+      multipolygon:       :MultiPolygon,
+      geometrycollection: :GeometryCollection,
+      multiline:          :Multiline
+    }.freeze
+
+    # Constant regex containing every GeoSparql data type that finds the type and the type's values.
+    GEOMETRY_REGEX = /(#{GEOSPARQL_TYPES.values.join('|')})\(+(.*?)\)+/i
 
     # Creates a new instance of GeosparqlToGeojson::Converter
     #
@@ -39,17 +50,40 @@ module GeosparqlToGeojson
       GeosparqlToGeojson::GeoJson.new(collect_geosparql_data)
     end
 
+    private
+
     # Creates a hash of each GeoSparql type present and it's values.
     def collect_geosparql_data
       @data_store = {}
-      GEOMETRY_TYPES.each do |geometry_type|
-        geosparql_data_match = @geosparql_values.scan(/#{geometry_type}\(+(.*?)\)+/i)
-        @data_store[geometry_type.to_sym] = geosparql_data_match unless geosparql_data_match.empty?
+
+      if @geosparql_values.is_a?(Array)
+        @geosparql_values.each do |value|
+          scanned_data = value.scan(GEOMETRY_REGEX)
+          populate_data_hash(scanned_data)
+        end
+      else
+        scanned_data = @geosparql_values.scan(GEOMETRY_REGEX)
+        populate_data_hash(scanned_data)
       end
 
       format_geosparql_data
     end
 
+    # Sets the hash key to the GeoSparql type if it isn't already set and adds the GeoSparql values
+    def populate_data_hash(scanned_geosparql_data)
+      scanned_geosparql_data.each do |data|
+        key = convert_key_to_correct_format(data[0])
+        @data_store[key] = [] unless @data_store[key]
+        @data_store[key] << data[1]
+      end
+    end
+
+    # Converts the key that's captured by the regex into the correct format
+    def convert_key_to_correct_format(key)
+      key = key.downcase
+      GEOSPARQL_TYPES[key.to_sym]
+    end
+
     # Splits values into arrays and converts them into floats.
     def format_geosparql_data
       @data_store.keys.each do |key|
@@ -69,7 +103,9 @@ module GeosparqlToGeojson
     #
     # @return [Array]
     def format_data(values, key)
-      values = @reverse ? values[0].split(/[\s]|[,]/).map!(&:to_f).reverse : values[0].split(/[\s]|[,]/).map!(&:to_f)
+      values = values.first if values.is_a?(Array)
+      values = values.split(/[\s]|[,]/).map!(&:to_f)
+      values.reverse! if @reverse
 
       values = values.each_slice(2).to_a if key != :Point
       values = [values] if key != :Point && key != :LineString
@@ -81,7 +117,7 @@ module GeosparqlToGeojson
       @data_hash_array = []
       @data_store.keys.each do |key|
         @data_store[key.to_sym].each do |data|
-          @data_hash_array << generate_feature_hash({ type: key.to_s, coordinates: data })
+          @data_hash_array << generate_feature_hash(type: key.to_s, coordinates: data)
         end
       end
 
@@ -103,11 +139,10 @@ module GeosparqlToGeojson
     #
     # @return [String] a string of GeoJSON
     def generate_feature_collection
-      data_hash = {
-                    type: 'FeatureCollection',
-                    features: @data_hash_array
-                  }
-      data_hash.to_json
+      {
+        type: 'FeatureCollection',
+        features: @data_hash_array
+      }.to_json
     end
   end
 end

data/lib/geosparql_to_geojson/version.rb

@@ -1,3 +1,3 @@
 module GeosparqlToGeojson
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geosparql_to_geojson
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Callum Neve-Jones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema