overhelper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f6e6e6f6736db9a3c53a02df213dcbf07de6df2
-  data.tar.gz: d5d6458f966fed3230ba0af0261fda4e956b7f41
+SHA256:
+  metadata.gz: ded8daf087ebc7f8f69c3af78e61da00041064c5a0d782851ea4a5db493b31b3
+  data.tar.gz: 5cfe20eb9e49f70b11fdc9e0cbc417cf27e65c42f0a1b287808b786ad457e403
 SHA512:
-  metadata.gz: 27e90774de971b98edf56f230607feeda3b8a37af0d582216b4d7f9a1840fe69d3421d5f285e67ec89db6f49ebafa09f2d2c9eb6d83864709f2975dee6db1811
-  data.tar.gz: feeaa4ed75bc80f02ec52f13f82e75f205749490aff8d0acefaa6703e8a1634f085c87890dd37d0373e04c29f93f4e7beaf8c23a5a88e9227f0c63e276c320a1
+  metadata.gz: 4e445aad84de157fdf1b5e7637054849490caf9376fadb3037dd76a3f375fe77515dbfedc3c2c04d3d27bc0d57b9958327fdb2b5f834e4a8d63e2a62c1b8a793
+  data.tar.gz: 2ad4a79792a369a8375825e1329409065848f4e83b2360c0bed52924157d13c3d18051841e8ff7e3adee61222c3185541dc7b63a6c085eb3aa88d9c8a7add693

data/lib/overhelper.rb

@@ -1,78 +1,80 @@
-# encoding: UTF-8
 require 'json'
+require_relative 'overhelper/complex_query_builder'
+
+include ComplexQueryBuilder
+
 
 class Overhelper
-	def self.list_of_locations_from_overpass_into_array(list, data=[])
-	  list.split(/[\n]+/m).each{|element|
-	      element = Hash[[:lat, :lon].zip(element.split(/[\s]+/m))]
-	      element[:lat] = element[:lat].to_f
-	      element[:lon] = element[:lon].to_f
-	      data << element
-	  }
-	  return data
-	end
+  def self.list_of_locations_from_overpass_into_array(list, data = [])
+    list.split(/[\n]+/m).each do |element|
+      element = Hash[[:lat, :lon].zip(element.split(/[\s]+/m))]
+      element[:lat] = element[:lat].to_f
+      element[:lon] = element[:lon].to_f
+      data << element
+    end
+    return data
+  end
 
-	EARTH_RADIUS_IN_M = 6371*1000
-	def self.distance_in_m(lat1, lon1, lat2, lon2)
+  EARTH_RADIUS_IN_M = 6371 * 1000
+  def self.distance_in_m(lat1, lon1, lat2, lon2)
 =begin
-	* Computes distance between two points on Earth using Haversine formula
-	* Earth is assumed to be sphere, errors from assuming spherical geometry might be up to 0.55% crossing the equator
-	* source: https://en.wikipedia.org/wiki/Haversine_formula and http://www.movable-type.co.uk/scripts/latlong.html
+  * Computes distance between two points on Earth using Haversine formula
+  * Earth is assumed to be sphere, errors from assuming spherical geometry might be up to 0.55% crossing the equator
+  * source: https://en.wikipedia.org/wiki/Haversine_formula and http://www.movable-type.co.uk/scripts/latlong.html
 =end
-		lat1 = lat1 * Math::PI / 180
-		lon1 = lon1 * Math::PI / 180
-		lat2 = lat2 * Math::PI / 180
-		lon2 = lon2 * Math::PI / 180
+    lat1 = lat1 * Math::PI / 180
+    lon1 = lon1 * Math::PI / 180
+    lat2 = lat2 * Math::PI / 180
+    lon2 = lon2 * Math::PI / 180
+
+    dLat = (lat2 - lat1).abs
+    dLon = (lon2 - lon1).abs
 
-		dLat = (lat2 - lat1).abs;
-		dLon = (lon2 - lon1).abs;
+    # a: square of half the chord length between the points
+    a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+    a += Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat2) * Math.cos(lat1)
+    angularDistanceInRadians = Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+    delta_in_m = 2 * EARTH_RADIUS_IN_M * angularDistanceInRadians
+    return delta_in_m
+  end
 
-		#a: square of half the chord length between the points
-		a = Math.sin(dLat / 2) * Math.sin(dLat / 2);
-		a += Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat2) * Math.cos(lat1);
-		angularDistanceInRadians = Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-		delta_in_m = 2 * EARTH_RADIUS_IN_M * angularDistanceInRadians;
-		return delta_in_m
-	end
+  def self.nodes_to_dict(data)
+    node_library = {}
+    data["elements"].each do |element|
+      next unless element["type"] == "node"
 
+      saved = {}
+      saved[:lat] = element["lat"].to_f
+      saved[:lon] = element["lon"].to_f
+      node_library[element["id"]] = saved
+    end
+    return node_library
+  end
 
-	def self.nodes_to_dict(data)
-		node_library = {}
-		for element in data["elements"]
-			if element["type"] == "node"
-				saved = {}
-				saved[:lat] = element["lat"].to_f
-				saved[:lon] = element["lon"].to_f
-				node_library[element["id"]] = saved
-			end
-		end
-		return node_library
-	end
+  def self.convert_to_ways(json_string)
+    data = JSON.parse(json_string)
 
-	def self.convert_to_ways(json_string)
-		data = JSON.parse(json_string)
+    node_library = nodes_to_dict(data)
 
-		node_library = nodes_to_dict(data)
+    ways = []
+    data["elements"].each do |element|
+      next unless element["type"] == "way"
 
-		ways = []
-		for element in data["elements"]
-			if element["type"] == "way"
-				nodes_of_way = element["nodes"]
-				prev_node = nil
-				for node in nodes_of_way
-					if prev_node != nil
-						way = {}
-						way[:lat1] = (node_library[prev_node])[:lat]
-						way[:lon1] = (node_library[prev_node])[:lon]
-						way[:lat2] = (node_library[node])[:lat]
-						way[:lon2] = (node_library[node])[:lon]
-						ways << way
-					end
-					prev_node = node
-				end
-			end
-		end
+      nodes_of_way = element["nodes"]
+      prev_node = nil
+      nodes_of_way.each do |node|
+        unless prev_node.nil?
+          way = {}
+          way[:lat1] = (node_library[prev_node])[:lat]
+          way[:lon1] = (node_library[prev_node])[:lon]
+          way[:lat2] = (node_library[node])[:lat]
+          way[:lon2] = (node_library[node])[:lon]
+          ways << way
+        end
+        prev_node = node
+      end
+    end
 
-		return ways
-	end
-end
+    return ways
+  end
+end

data/lib/overhelper/complex_query_builder.rb

@@ -0,0 +1,38 @@
+module ComplexQueryBuilder
+  def self.filter_across_named_region(filter, name)
+    name_filter = CartoCSSHelper::OverpassQueryGenerator.turn_tag_into_overpass_filter(['name', name])
+    return "[out:json][timeout:2500];
+  area" + name_filter + "->.searchArea;
+  (
+    node#{filter}(area.searchArea);
+    way#{filter}(area.searchArea);
+    relation#{filter}(area.searchArea);
+  );
+  out meta;
+  >;
+  out meta qt;"
+  end
+
+  # tag negation is very slow - overpass will sometimes allow this type of query while using tag!=* will cause it to fail
+  def self.two_pass_filter_across_named_region(filter, negative_filter, name)
+    name_filter = CartoCSSHelper::OverpassQueryGenerator.turn_tag_into_overpass_filter(['name', name])
+    return "[out:json][timeout:2500];
+  area" + name_filter + "->.searchArea;
+  (
+    way#{filter}(area.searchArea);
+    node#{filter}(area.searchArea);
+    relation#{filter}(area.searchArea);
+  )-> .a;
+  (
+    way#{negative_filter}(area.searchArea);
+    node#{negative_filter}(area.searchArea);
+    relation#{negative_filter}(area.searchArea);
+  ) -> .b;
+  (
+  .a - .b;
+  );
+  out meta;
+  >;
+  out meta qt;"
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: overhelper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
-dependencies: []
+date: 2019-10-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: matkoniecz-ruby-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: overpass_turbo_helper
 email:
 - matkoniecz@gmail.com
@@ -18,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/overhelper.rb
+- lib/overhelper/complex_query_builder.rb
 - license.txt
 homepage: https://github.com/matkoniecz/overhelper
 licenses:
@@ -38,8 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: overpass_turbo_helper.