travlrmap 0.0.9 → 0.0.10

data/lib/travlrmap/sinatra_app.rb

@@ -18,6 +18,10 @@ module Travlrmap
       include Rack::Utils
 
       alias_method :h, :escape_html
+
+      def base_url
+        @base_url ||= "#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}"
+      end
     end
 
     def kml_style_url(type)
@@ -68,7 +72,7 @@ module Travlrmap
 
         f.features << KML::Placemark.new(
           :name        => point[:title],
-          :description => point[:comment],
+          :description => erb(:"_point_comment", :layout => false, :locals => {:point => point}),
           :geometry    => KML::Point.new(:coordinates => {:lat => point[:lat], :lng => point[:lon]}),
           :style_url   => "#%s" % kml_style_url(point[:type])
         )

data/lib/travlrmap/version.rb

@@ -1,3 +1,3 @@
 module Travlmap
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/views/_map_js.erb

@@ -1,30 +1,24 @@
 <script type="text/javascript">
-  $(document).ready(function(){
-   var map = new GMaps({
-      el: '#main_map',
-      lat: <%= @map_view[:lat] %>,
-      lng: <%= @map_view[:lon] %>,
-      zoom: <%= @map_view[:zoom] %>,
-      zoomControl : <%= @zoom_control %>,
-      mapTypeControl : <%= @map_type_control %>,
-      streetViewControl : <%= @street_view_control %>,
-      overviewMapControl : <%= @overview_control %>,
-      panControl : <%= @pan_control %>,
-      zoomControlOpt: {
-          style : 'DEFAULT',
-          position: 'TOP_LEFT'
-      },
+    var map;
+    $(document).ready(function(){
+      infoWindow = new google.maps.InfoWindow({});
+      map = new GMaps({
+        div: '#main_map',
+        zoom: <%= @map_view[:zoom] %>,
+        lat: <%= @map_view[:lat] %>,
+        lng: <%= @map_view[:lon] %>,
+      });
+      map.loadFromKML({
+        url: '<%= base_url %>/kml?t=<%= Time.now.to_i %>',
+        suppressInfoWindows: true,
+        preserveViewport: true,
+        events: {
+          click: function(point){
+            infoWindow.setContent(point.featureData.infoWindowHtml);
+            infoWindow.setPosition(point.latLng);
+            infoWindow.open(map.map);
+          }
+        }
+      });
     });
-<% @points.each do |point| %>
-    map.addMarker({
-            lat: <%= point[:lat] %>,
-            lng: <%= point[:lon] %>,
-            title: "<%= h point[:title] %>",
-            icon: "<%= @types[ point[:type] ][:icon] %>",
-            infoWindow: {
-              content: <%= erb :"_point_comment", :layout => false, :locals => {:point => point} %>
-            }
-    });
-<% end %>
-  });
 </script>

data/views/_point_comment.erb

@@ -1,15 +1,15 @@
-"<p><h4><%= h point[:title] %></h3> \
+<p>
 <% if point[:href] && point[:linkimg] %>
 <%   if point[:comment] %>
-<%=    h point[:comment] %><br /><br /> \
+<%=    h point[:comment] %><br /><br />
 <%   end %>
-<a href='<%= point[:href] %>' target='_blank'><img src='<%= point[:linkimg] %>'></a> \
+<a href='<%= point[:href] %>' target='_blank'><img src='<%= point[:linkimg] %>'></a>
 <% elsif point[:href] && point[:linktext] %>
 <%   if point[:comment] %>
-<%=    h point[:comment] %><br /><br /> \
+<%=    h point[:comment] %><br /><br />
 <%   end %>
-<a href='<%= point[:href] %>' target='_blank'><%= point[:linktext] %></a> \
+<a href='<%= point[:href] %>' target='_blank'><%= point[:linktext] %></a>
 <% elsif point[:comment] %>
-<%= h point[:comment] %> \
+<%= h point[:comment] %>
 <% end %>
-</p>"
+</p>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: travlrmap
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - R.I.Pienaar