leaflet_helper 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2e318e079044796d4ead699979deea3b49bdae
-  data.tar.gz: d2a7a881a2824a0270180a5ef632010504f8825c
+  metadata.gz: 5650a8adc68441642df6c25ca2b01dba2a7d3b27
+  data.tar.gz: 1cdd5e5a22646db9406608f8e29895e37106c342
 SHA512:
-  metadata.gz: 3cba373b4dd9394014eaa00d163b5631adcba322185ae89d04da101dc354b766bbdf9bc88ab418e9d40857cbed7abe5a5b7fc943e2110f9ddfaf4443cdaae56a
-  data.tar.gz: f6fc47ca34a34c6e980b6c514e19e4302aa22d55ca540faf268a73ce41ae90228ddb2480d5491bdc654612cf736193cbfa475e7102bb79e85d1787a602d1c269
+  metadata.gz: f6fba4557327c9c3302c3e00fc781b5794673f80ec21dc3e69ec1dbf81413038c572dd6c5753343054e4eaba7b72a25ab2bbc12262f6da4b296fbd9ef7200ab0
+  data.tar.gz: 2e50c27dc53be78a08a08f8304895cc17cd1bd2bac6377cc7dfd3b5f1baa53059193ebfae48f79460150e6bd20bd39606bb197a007f60f0423e5d5b596d78c1f

data/leaflet_helper.gemspec

@@ -5,7 +5,7 @@ require 'leaflet_helper/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "leaflet_helper"
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ["Dewayne VanHoozer"]
   spec.email         = ["dvanhoozer@gmail.com"]
 

data/lib/leaflet_helper.rb

@@ -15,7 +15,7 @@ module LeafletHelper
             markers:   false 
           }.merge(options)
 
-        raise RuntimeError, 'Already initialized' if initialized?
+        # raise RuntimeError, 'Already initialized' if initialized?
         initialized!
 
         leaflet_script = <<~EOS
@@ -29,7 +29,7 @@ module LeafletHelper
 
             if (ajaxRequest == null) {
               alert ("This browser does not support HTTP Request");
-              return;
+              // return;
             }
 
             // SMELL: this function is not map specific
@@ -79,6 +79,11 @@ module LeafletHelper
         leaflet_script = <<~EOS
           <script>
 
+            var #{var_name};
+            var ajaxRequest; // SMELL: not map specific
+            var plotlistFor#{id};
+            var plotlayersFor#{id} = [];
+
             // set up the map
             #{var_name} = new L.Map('#{id}');
 
@@ -123,7 +128,8 @@ module LeafletHelper
 
       def add_support_for_markers(id="map", options={})
         o = {
-            markers:   true
+            markers:   true,
+            route:     "#{id}/markers"
           }.merge(options)
 
         var_name = get_var_name(id)
@@ -146,8 +152,10 @@ module LeafletHelper
               var maxll   = bounds.getNorthEast();
 
               // FIXME: msg is the URL from which to get markers
-              var msg     = 'leaflet/findbybbox.cgi?format=leaflet&bbox='+minll.lng+','+minll.lat+','+maxll.lng+','+maxll.lat;
+              // var msg     = 'leaflet/findbybbox.cgi?format=leaflet&bbox='+minll.lng+','+minll.lat+','+maxll.lng+','+maxll.lat;
               
+              var msg = '#{o[:route]}';
+
               ajaxRequest.onreadystatechange =  stateChangedFor#{id};
               ajaxRequest.open('GET', msg, true);
               ajaxRequest.send(null);
@@ -171,7 +179,7 @@ module LeafletHelper
 
                     #{var_name}.addLayer(plotmark);
                     plotmark.bindPopup("<h3>" + plotlist[i].name + "</h3>" + plotlist[i].details);
-                    plotlayers.push(plotmark);
+                    plotlayersFor#{id}.push(plotmark);
                   } // for
 
                 } // if (ajaxRequest.status == 200)
@@ -182,10 +190,10 @@ module LeafletHelper
 
 
             function removeMarkersFrom#{id}() { // was: removeMarkers
-              for (i=0; i<plotlayers.length; i++) {
-                #{var_name}.removeLayer(plotlayers[i]);
+              for (i=0; i<plotlayersFor#{id}.length; i++) {
+                #{var_name}.removeLayer(plotlayersFor#{id}[i]);
               }
-              plotlayers = [];
+              plotlayersFor#{id} = [];
             }
 
           </script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dewayne VanHoozer