leaflet_helper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764b4f62f21a26bf252db2bbe2d4e3a790af0a73
-  data.tar.gz: b0b0d1e5894155ae524d284c18e433362a012306
+  metadata.gz: fb2e318e079044796d4ead699979deea3b49bdae
+  data.tar.gz: d2a7a881a2824a0270180a5ef632010504f8825c
 SHA512:
-  metadata.gz: f7d9e4ab4217d566e440a052d95b5b19786f81ec37e15230d13637d669dbd5e730ae4e587751db2688db997ca0add8c36479434a6816fb2be7c03a775e8251ee
-  data.tar.gz: 9e7b350e260e63028f1178b34963115f751e7f9a648f6216f7fa98f26f24b91274e86917491a55a034ab9ab4bd9e06b97b102906f8b7f0ce699dc55b3e3dfdec
+  metadata.gz: 3cba373b4dd9394014eaa00d163b5631adcba322185ae89d04da101dc354b766bbdf9bc88ab418e9d40857cbed7abe5a5b7fc943e2110f9ddfaf4443cdaae56a
+  data.tar.gz: f6fc47ca34a34c6e980b6c514e19e4302aa22d55ca540faf268a73ce41ae90228ddb2480d5491bdc654612cf736193cbfa475e7102bb79e85d1787a602d1c269

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.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["Dewayne VanHoozer"]
   spec.email         = ["dvanhoozer@gmail.com"]
 

data/lib/leaflet_helper.rb

@@ -2,25 +2,55 @@
 
 module LeafletHelper
   class L
-    VERSION         = '0.7.3'
-    @@maps          = []
+    VERSION         = '0.7.3'       # of leaflet.js
+    @@map_ids       = []            # the div ids of all of the maps
+    @@markers       = Hash.new([])  # An array of markers for each map id
     @@initialized   = false
+
     class << self
 
-      # intended for the layout.haml file in the head section
-      def init
-        return '' if @@initialized
-        @@initialized = true
-        return <<~EOS
+      # intended for the the head section
+      def init(options={})
+        o = {
+            markers:   false 
+          }.merge(options)
+
+        raise RuntimeError, 'Already initialized' if initialized?
+        initialized!
+
+        leaflet_script = <<~EOS
           <script type="text/javascript" src="//cdn.leafletjs.com/leaflet-#{VERSION}/leaflet.js"></script>
           <link rel="stylesheet" href="//cdn.leafletjs.com/leaflet-#{VERSION}/leaflet.css">
+        
+          <script>
+
+            // set up AJAX request
+            ajaxRequest = getXmlHttpObject();
+
+            if (ajaxRequest == null) {
+              alert ("This browser does not support HTTP Request");
+              return;
+            }
+
+            // SMELL: this function is not map specific
+            function getXmlHttpObject() {
+              if (window.XMLHttpRequest) { return new XMLHttpRequest(); }
+              if (window.ActiveXObject)  { return new ActiveXObject("Microsoft.XMLHTTP"); }
+              return null;
+            }
+
+          </script>
+
         EOS
+
+        return leaflet_script
       end # def init
 
+
       # intended for the body of a web page
       # hope to support multiple maps on a page
-      def map(id='map', options={})
-        @@maps << id
+      def place_map_here(id='map', options={})
+        @@map_ids << id
         o = {
           style: "width: 800px; height: 400px"
         }.merge(options)
@@ -29,42 +59,191 @@ module LeafletHelper
           div_options += " #{k.to_s}=" + '"' + v + '"'
         end
         return <<~EOS
-          <div id="#{id}" #{div_options}></div>
+          <div id="#{id}"#{div_options}></div>
         EOS
       end # def map(id='map')
 
+
       # Intended for the body at the bottom
-      def show_with_openstreetmap_layer(id="map", options={})
+      def show_map(id="map", options={})
         o = {
             latitude:   37.235,
             longitude:  -115.811111,
             zoom:       9,
             min_zoom:   2,
-            max_zoom:   22 
+            max_zoom:   22
           }.merge(options)
-        var_name = "lh_#{id}"
-        return <<~EOS
+
+        var_name = get_var_name(id)
+
+        leaflet_script = <<~EOS
           <script>
 
             // set up the map
             #{var_name} = new L.Map('#{id}');
 
+            // start the map at a given location and zoom level
+            #{var_name}.setView(new L.LatLng(#{o[:latitude]}, #{o[:longitude]}), #{o[:zoom]});
+          
+          </script>
+        EOS
+
+        return leaflet_script
+      end # def show_map(id="map", options={})
+
+
+      # Intended for the body at the bottom
+      def add_openstreetmap_layer(id="map", options={})
+        o = {
+            latitude:   37.235,
+            longitude:  -115.811111,
+            zoom:       9,
+            min_zoom:   2,
+            max_zoom:   22 
+          }.merge(options)
+
+        var_name = get_var_name(id)
+
+        leaflet_script = <<~EOS
+          <script>
+
             // create the tile layer with correct attribution
             var osmUrl    ='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
             var osmAttrib ='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
             var osm       = new L.TileLayer(osmUrl, {minZoom: #{o[:min_zoom]}, maxZoom: #{o[:max_zoom]}, attribution: osmAttrib});   
-
-            // start the map in South-East England
-            #{var_name}.setView(new L.LatLng(#{o[:latitude]}, #{o[:longitude]}), #{o[:zoom]});
             
             #{var_name}.addLayer(osm);
 
           </script>
         EOS
-      end # def show_with_openstreetmap_layer(id="map", options={})
+
+        return leaflet_script
+      end # def add_openstreetmap_layer(id="map", options={})
+
+
+      def add_support_for_markers(id="map", options={})
+        o = {
+            markers:   true
+          }.merge(options)
+
+        var_name = get_var_name(id)
+
+        leaflet_script = <<~EOS
+          <script>
+
+            getMarkersFor#{id}(); // askForPlots();
+            #{var_name}.on('moveend', on#{id}Move);
+
+            function on#{id}Move(e) { getMarkersFor#{id}(); }
+
+
+
+            // request the marker info with AJAX for the current bounds
+            function getMarkersFor#{id}() { // was: askForPlots
+
+              var bounds  = #{var_name}.getBounds();
+              var minll   = bounds.getSouthWest();
+              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;
+              
+              ajaxRequest.onreadystatechange =  stateChangedFor#{id};
+              ajaxRequest.open('GET', msg, true);
+              ajaxRequest.send(null);
+            }
+
+
+            function stateChangedFor#{id}() { // was: stateChanged
+
+              // if AJAX returned a list of markers, add them to the map
+              if (ajaxRequest.readyState == 4) {
+
+                // use the info here that was returned
+                if (ajaxRequest.status == 200) {
+                  plotlist = eval("(" + ajaxRequest.responseText + ")");
+                  removeMarkersFrom#{id}();
+
+                  for (i=0; i<plotlist.length; i++) {
+                    var plotll    = new L.LatLng(plotlist[i].lat, plotlist[i].lon, true);
+                    var plotmark  = new L.Marker(plotll);
+                    plotmark.data = plotlist[i];
+
+                    #{var_name}.addLayer(plotmark);
+                    plotmark.bindPopup("<h3>" + plotlist[i].name + "</h3>" + plotlist[i].details);
+                    plotlayers.push(plotmark);
+                  } // for
+
+                } // if (ajaxRequest.status == 200)
+
+              } // if (ajaxRequest.readyState == 4)
+
+            } // function stateChangedFor#{id}()
+
+
+            function removeMarkersFrom#{id}() { // was: removeMarkers
+              for (i=0; i<plotlayers.length; i++) {
+                #{var_name}.removeLayer(plotlayers[i]);
+              }
+              plotlayers = [];
+            }
+
+          </script>
+        EOS
+
+        return leaflet_script
+      end # def add_support_for_markers(map_id, map_options) 
+
+
+      # TODO: extrach marker methods into a Marker class
+      def add_marker(marker={}, map_id='map')
+        # TODO: add_marker
+      end
+
+
+      def delete_marker(marker={}, map_id='map')
+        # TODO: delete_marker
+      end
+
+
+      def get_var_name(id="map")
+        return "lh_#{id}"
+      end
+
+
+      def comment(a_string='####################################################')
+        return "<!-- #{a_string}  -->"
+      end
+
+
+      private
+
+      def initialized!
+        @@initialized = true
+      end
+
+
+      def initialized?
+        @@initialized
+      end
 
 
 
     end # class << self
   end # class L
 end # module LeafletHelper
+
+
+__END__
+
+A JSON marker array with one entry looks like this:
+
+[
+  {
+    "name":"Tunbridge Wells, Langton Road, Burnt Cottage",
+    "lon":"0.213102",
+    "lat":"51.1429",
+    "details":"A Grade II listed five bedroom wing in need of renovation."
+  }
+]
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leaflet_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dewayne VanHoozer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler