dasht 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40d3069511f251aed61edcf612e2abd59ab3f691
-  data.tar.gz: cc9ad8dc60e394571d4aa7a1e92f4d8d8b627ffc
+  metadata.gz: 4172297a523fc233da93c9116c3576f8220301ab
+  data.tar.gz: cfc58240f9357a835fabe76bf2ed2316ca4dde60
 SHA512:
-  metadata.gz: 91f2acd7ec9858f7344b8b5743d22a24dd9b182375a5519c5e92ec9e2ee5e419d83a88da569dac4fe4b991495f9eba39f23668c1115eb581bd61c528af51d4b0
-  data.tar.gz: a98a0da102662584d6a076ed5e808e2463a9ba50d19214c5f95ef95e14689d0334ceb468589c1d978c3ba5a42080794218693d97dc9e69d9236a3eb2bd632d14
+  metadata.gz: c5f033754984bff49d718f7ca6d72fd9341b6e5ff04054231094d38c5ff6d25657c00b86fc0651d21279a582675587785bb50d7b656a7fdd33fb893d7fb076a6
+  data.tar.gz: 2f6bc5e70760c73d60437e8273fd64541ac1c71324c1355b182297949fa6497768cfeb27fb4bbb4409cac22c3b4e6afa23649bfaf18889d1982fd9490b016cbb

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/assets/plugins/map.js

@@ -40,7 +40,24 @@ Dasht.map_plot_ip = function(map, markers, ip) {
     });
 }
 
-Dasht.map_plot_location = function(map, markers, address_or_ip, location) {
+Dasht.map_plot_coordinates = function(map, markers, coordinates) {
+    // Maybe pull the location from cache.
+    var location;
+    if (location = Dasht.map_geocoder_cache[coordinates]) {
+        Dasht.map_plot_location(map, markers, coordinates, location);
+        return;
+    }
+
+    var coordinate_regex = /\[(-?\d+\.\d+),\s*(-?\d+\.\d+)\]/;
+    var matches = coordinates.match(coordinate_regex);
+    var lng = parseFloat(matches[1]);
+    var lat = parseFloat(matches[2]);
+    var location = new google.maps.LatLng(lat, lng);
+    Dasht.map_geocoder_cache[coordinates] = location;
+    Dasht.map_plot_location(map, markers, coordinates, location);
+}
+
+Dasht.map_plot_location = function(map, markers, item, location) {
     var location_exists = _.any(_.values(markers), function(marker) {
         return _.isEqual(marker.position, location);
     });
@@ -54,7 +71,7 @@ Dasht.map_plot_location = function(map, markers, address_or_ip, location) {
     });
 
     // Keep track of markers.
-    markers[address_or_ip] = marker;
+    markers[item] = marker;
 }
 
 Dasht.map_init = function(el, options) {
@@ -115,11 +132,7 @@ Dasht.map_init = function(el, options) {
                 if (item.search(ip_regex) >= 0) {
                     Dasht.map_plot_ip(map, markers, item);
                 } else if (item.search(coordinate_regex) >= 0) {
-                    var matches = item.match(coordinate_regex);
-                    var lng = parseFloat(matches[1]);
-                    var lat = parseFloat(matches[2]);
-                    var location = new google.maps.LatLng(lat, lng);
-                    Dasht.map_plot_location(map, markers, item, location);
+                    Dasht.map_plot_coordinates(map, markers, item);
                 } else {
                     Dasht.map_plot_address(map, markers, geocoder, item);
                 }

data/dasht.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dasht 0.1.8 ruby lib
+# stub: dasht 0.1.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dasht"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dasht
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Rusty Klophaus