travlrmap 1.3.0 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cbd4ee983108002c9123f4ee18b7feaf41211776
+  data.tar.gz: aa0ba4789329d23111ef3163018d426453d55c88
+SHA512:
+  metadata.gz: 64791fc2b52ca5227b611336052a8960af8c63330b313df74db25f6da0f3bc1c161f53cdd99f448a90e5c50ed632a4cd764fe42631d54b3ae9e6995fe3be3689
+  data.tar.gz: 7017617b29ba8d095357ebda10b16b7210f1685ce2de1759b372e1250084d6fa8095409003aa9d61d677b44edf3fdffb9f5a52e598cb609730f05c676fc04ab0

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'sinatra'
-gem 'httparty', '0.11.0'
-gem 'json'
-gem 'ruby_kml'
-gem 'nokogiri', '1.5.2'
+gem 'sinatra', '~> 1.4'
+gem 'httparty', '~> 0.13'
+gem 'json', '~> 1.8'
+gem 'ruby_kml', '~> 0.1'
+gem 'nokogiri', '~> 1.6'
 gem 'rack', '1.5.2'

data/Gemfile.lock

@@ -2,13 +2,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.2.2)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    httparty (0.13.3)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
-    json (1.8.1)
-    multi_json (1.10.1)
+    json (1.8.2)
+    mini_portile (0.6.2)
     multi_xml (0.5.5)
-    nokogiri (1.5.2)
+    nokogiri (1.6.6.1)
+      mini_portile (~> 0.6.0)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
@@ -25,9 +26,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  httparty (= 0.11.0)
-  json
-  nokogiri (= 1.5.2)
+  httparty (~> 0.13)
+  json (~> 1.8)
+  nokogiri (~> 1.6)
   rack (= 1.5.2)
-  ruby_kml
-  sinatra
+  ruby_kml (~> 0.1)
+  sinatra (~> 1.4)

data/lib/travlrmap.rb

@@ -4,10 +4,14 @@ require 'yaml'
 require 'sinatra'
 require 'json'
 require "digest/md5"
+require 'cgi'
 
 Bundler.require(:default)
 
 module Travlrmap
   require 'travlrmap/version'
+  require 'travlrmap/util'
+  require 'travlrmap/point'
+  require 'travlrmap/points'
   require 'travlrmap/sinatra_app'
 end

data/lib/travlrmap/point.rb

@@ -0,0 +1,120 @@
+module Travlrmap
+  class Point
+    def initialize(from, types, type=:json)
+      @point = {}
+      @types = types
+
+      if from.is_a?(Hash)
+        from_hash(from)
+      elsif from.is_a?(String)
+        if type == :json
+          from_json(from)
+        else
+          from_yaml(from)
+        end
+      end
+    end
+
+    def preview
+      {"yaml" => YAML.dump([self.to_hash]).lines.to_a[1..-1].join,
+       "html" => self.to_html}
+    end
+
+    def type
+      @types[ self[:type] ]
+    end
+
+    def h(string)
+      Rack::Utils.escape_html(string)
+    end
+
+    def [](key)
+      @point.fetch(key, nil)
+    end
+
+    def []=(key, val)
+      @point[key] = val
+    end
+
+    def fetch(key, default)
+      @point.fetch(key, default)
+    end
+
+    def to_html(title=true)
+      ERB.new(point_html_template, nil, "<>").result(binding)
+    end
+
+    def to_json
+      @point.to_json
+    end
+
+    def to_hash
+      @point.clone
+    end
+
+    def to_placemark
+      KML::Placemark.new(
+        :name        => self[:title],
+        :description => to_html(false),
+        :geometry    => KML::Point.new(:coordinates => {:lat => self[:lat], :lng => self[:lon]}),
+        :style_url   => "#%s" % Util.kml_style_url(self[:type], :type)
+      )
+    end
+
+    private
+    def from_json(from)
+      p = JSON.parse(from)
+      data = {}
+
+      p.each_pair{|k, v| data[k.intern] = v}
+
+      from_hash(data)
+    end
+
+    def from_yaml(from)
+      from_hash(YAML.load(from))
+    end
+
+    def from_hash(data)
+      [:title, :comment, :country, :date, :href, :linktext, :linkimg, :lon, :lat, :type].each do |i|
+        if data[i].is_a?(String)
+          @point[i] = data[i] unless data[i].empty?
+        else
+          @point[i] = data[i]
+        end
+      end
+
+      @point[:type] = data[:type].intern unless data[:type].is_a?(Symbol)
+    end
+
+    def point_html_template
+      <<-EOS
+<p>
+<% if title %><font size="+2"><%= @point[:title] %></font><% end %>
+<hr>
+<% if @point[:comment] %>
+<%=  h @point[:comment] %><br /><br />
+<% end %>
+<% if @point[:href]  %>
+     <a href='<%= @point[:href] %>' target='_blank'>
+<% end %>
+<% if @point[:linkimg] || @point[:linktext] %>
+<%   if @point[:linkimg] %>
+       <img src='<%= @point[:linkimg] %>'><br />
+<%   end %>
+<%   if @point[:linktext] %>
+       <%= h @point[:linktext] %>
+<%   end %>
+<% elsif @point[:href] %>
+     <%= Util.domain_from_url(@point[:href]) %>
+<% end %>
+<% if @point[:href]  %>
+     </a>
+<% end %>
+</p>
+<p>
+<font size"-2"><%= h @types[ @point[:type] ][:description] %><% if @point[:date] %> on <%= h @point[:date] %><% end %></font>
+      EOS
+    end
+  end
+end

data/lib/travlrmap/points.rb

@@ -0,0 +1,164 @@
+module Travlrmap
+  class Points
+    def initialize(types, sets, map)
+      @types = types
+      @sets = sets
+      @map = map
+
+      reset
+    end
+
+    def has_title?(title)
+      !!find_title(title)
+    end
+
+    def find_title(title)
+      @points.find_index do |point|
+        point[:title] == title
+      end
+    end
+
+    def replace!(title, point)
+      raise("Can only store instances of Point") unless point.is_a?(Point)
+
+      if idx = find_title(title)
+        @points[idx] = point
+      else
+        raise("No point with title %s to replace" % title)
+      end
+    end
+
+    def save_to_file(file)
+      File.open(file, "w") do |f|
+        f.puts YAML.dump(:points => @points.map{|p| p.to_hash})
+      end
+    end
+
+    def <<(point)
+      raise("Can only store instances of Point") unless point.is_a?(Point)
+
+      @points << point
+    end
+
+    def reset
+      @points = []
+    end
+
+    def by_country
+      @points.sort_by do |point|
+        point[:country]
+      end
+    end
+
+    def map
+      by_country.map do |point|
+        yield(point)
+      end
+    end
+
+    def each
+      by_country.each do |point|
+        yield(point)
+      end
+    end
+
+    def countries
+      @points.map do |point|
+        point[:country]
+      end.compact.sort.uniq
+    end
+
+    def size
+      @points.size
+    end
+    alias :count :size
+
+
+    def to_kml
+      require 'ruby_kml'
+
+      kml = KMLFile.new
+      document = KML::Document.new(:name => "Travlrmap Data")
+      folder = KML::Folder.new(:name => "Countries")
+      folders = {}
+
+      @types.each do |k, t|
+        document.styles << KML::Style.new(
+          :id         => Util.kml_style_url(k, :type),
+          :icon_style => KML::IconStyle.new(:icon => KML::Icon.new(:href => t[:icon]))
+        )
+      end
+
+      self.each do |point|
+        unless folders[point[:country]]
+          folder.features << folders[point[:country]] = KML::Folder.new(:name => point[:country])
+        end
+
+        f = folders[point[:country]]
+
+        f.features << point.to_placemark
+      end
+
+      document.features << folder
+      kml.objects << document
+
+      kml.render
+    end
+
+    def to_json
+      @points.map do |point|
+        temp = point.to_hash
+        temp[:popup_html] = point.to_html
+        temp[:icon] = point.type[:icon]
+        temp
+      end.to_json
+    end
+
+    def load_points_from_file(file)
+      points_from_data(load_file(file))
+    end
+
+    def load_points(set=nil)
+      reset
+
+      files_for_set(set).each do |file|
+        if file.is_a?(Symbol)
+          self.load_points(file)
+        else
+          file = point_file(file)
+
+          if File.directory?(file)
+            load_directory(file)
+          else
+            load_points_from_file(file)
+          end
+        end
+      end
+    end
+
+    def files_for_set(set)
+      return Array(@sets[set][:data]) if set
+      return Array(@map[:data])
+    end
+
+    def point_file(file)
+      File.join(File.join(APPROOT, "config", file))
+    end
+
+    def points_from_data(data)
+      data[:points].each do |point|
+        @points << Point.new(point, @types)
+      end
+    end
+
+    def load_directory(directory)
+      Dir.entries(directory).grep(/\.yaml$/).each do |points|
+        points_from_data(load_file(File.join(directory, points)))
+      end
+    end
+
+    def load_file(file)
+      YAML.load_file(file)
+    end
+  end
+end

data/lib/travlrmap/sinatra_app.rb

@@ -13,6 +13,9 @@ module Travlrmap
 
       @map[:map_types] = ["hybrid", "roadmap", "satellite", "terrain", "osm"] unless @map[:map_types]
       @map[:default_map_type] = "roadmap" unless @map[:default_map_type]
+      @map[:theme] = "css" unless @map[:theme]
+
+      raise "Unknown theme %s" % @map[:theme] unless valid_themes.include?(@map[:theme])
 
       super()
     end
@@ -21,16 +24,17 @@ module Travlrmap
     set :views, File.join(File.expand_path(File.dirname(__FILE__)), "../..", "views")
     set :public_folder, File.join(File.expand_path(File.dirname(__FILE__)), "../..", "public")
 
+    def valid_themes
+      ["cerulean", "cosmo", "cyborg", "darkly", "flatly", "journal",
+       "lumen", "paper", "readable", "sandstone", "simplex", "slate",
+       "spacelab", "superhero", "united", "yeti", "css"]
+    end
+
     helpers do
       include Rack::Utils
 
       alias_method :h, :escape_html
 
-      def domain_from_url(url)
-        host = URI.parse(url).host.downcase
-        host.start_with?('www.') ? host[4..-1] : host
-      end
-
       def protected!
         return if authorized?
         headers['WWW-Authenticate'] = 'Basic realm="Restricted Area"'
@@ -61,37 +65,9 @@ module Travlrmap
       end
     end
 
-    def kml_style_url(type)
-      "travlrmap-%s-style" % type
-    end
-
     def load_map(set=nil)
-      @points = []
-
-      if set
-        files = Array(@config[:sets][set][:data])
-      else
-        files = Array(@config[:map][:data])
-      end
-
-      files.each do |map|
-        if map.is_a?(Symbol)
-          @points.concat(load_map(map))
-        else
-          point_file = File.join(File.join(APPROOT, "config", map))
-
-          if File.directory?(point_file)
-            Dir.entries(point_file).grep(/\.yaml$/).each do |points|
-              file = File.join(point_file, points)
-              data = YAML.load_file(file)
-              @points.concat(data[:points])
-            end
-          else
-            data = YAML.load_file(point_file)
-            @points.concat(data[:points])
-          end
-        end
-      end
+      @points = Points.new(@types, @sets, @map)
+      @points.load_points(set)
     end
 
     def set_map_vars(view, set=nil)
@@ -105,68 +81,6 @@ module Travlrmap
       @active_set = set
     end
 
-    def to_json
-      @points.sort_by{|p| p[:country]}.map do |point|
-        point[:popup_html] = erb(:"_point_comment", :layout => false, :locals => {:point => point})
-        point[:icon] = @types[ point[:type] ][:icon]
-        point
-      end.to_json
-    end
-
-    def to_kml
-      require 'ruby_kml'
-
-      kml = KMLFile.new
-      document = KML::Document.new(:name => "Travlrmap Data")
-      folder = KML::Folder.new(:name => "Countries")
-      folders = {}
-
-      @types.each do |k, t|
-        document.styles << KML::Style.new(
-          :id         => kml_style_url(k),
-          :icon_style => KML::IconStyle.new(:icon => KML::Icon.new(:href => t[:icon]))
-        )
-      end
-
-      @points.sort_by{|p| p[:country]}.each do |point|
-        unless folders[point[:country]]
-          folder.features << folders[point[:country]] = KML::Folder.new(:name => point[:country])
-        end
-
-        f = folders[point[:country]]
-
-        f.features << KML::Placemark.new(
-          :name        => point[:title],
-          :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])
-        )
-      end
-
-      document.features << folder
-      kml.objects << document
-
-      kml.render
-    end
-
-    def point_from_json(json)
-      data = JSON.parse(json)
-
-      point = {}
-
-      ["title", "comment", "country", "date", "href", "linktext", "linkimg", "lon", "lat"].each do |i|
-        if data[i].is_a?(String)
-          point[i.intern] = data[i] unless data[i].empty?
-        else
-          point[i.intern] = data[i]
-        end
-      end
-
-      point[:type] = data["type"].intern
-
-      point
-    end
-
     get '/view/:view/?:set?' do
       params[:view] ? view = params[:view].intern : view = :default
       params[:set] ? set = params[:set].intern : set = nil
@@ -208,7 +122,7 @@ module Travlrmap
 
       content_type :"application/vnd.google-earth.kml+xml"
       load_map(set)
-      to_kml
+      @points.to_kml
     end
 
     get '/points/json/?:set?' do
@@ -216,47 +130,42 @@ module Travlrmap
 
       content_type :"application/json"
       load_map(set)
-      to_json
+      @points.to_json
     end
 
     post '/points/save' do
       content_type :"application/json"
 
-      if !@map[:authenticate]
-        halt(403, "Can only save data if authentication is enabled")
-      end
-
       protected!
 
-      halt(403, "No :save_to location configured") unless @map[:save_to]
+      begin
+        raise("Can only save data if authentication is enabled") unless @map[:authenticate]
 
-      save_file = File.join(APPROOT, "config", "%s.yaml" % @map[:save_to])
+        raise("No :save_to location configured") unless @map[:save_to]
 
-      halt(403, ":save_to location is not writable") unless File.writable?(save_file)
+        save_file = File.join(APPROOT, "config", "%s.yaml" % @map[:save_to])
 
-      points = YAML.load(File.read(save_file))
+        raise(":save_to location is not writable") unless File.writable?(save_file)
 
-      halt(403, "Failed to load :save_to location as valid YAML") unless points
-      halt(403, "Failed to load :save_to location as valid points file") unless points[:points]
+        points = Points.new(@types, @sets, @map)
+        points.load_points_from_file(save_file)
 
-      begin
-        new_point = point_from_json(request.body.read)
+        raise("Failed to load :save_to location as valid YAML") unless points
 
-        index = points[:points].find_index{|p| p[:title] == new_point[:title]}
+        new_point = Util.point_from_json(request.body.read, @types)
+        title = new_point[:title]
 
-        if index
-          points[:points][index] = new_point
-          result = '{"status":"success","message":"%s has been updated"}' % h(new_point[:title])
+        if points.has_title?(title)
+          points.replace!(title, new_point)
+          result = '{"status":"success","message":"%s has been updated"}' % h(title)
         else
-          points[:points] << new_point
-          result = '{"status":"success","message":"%s has been saved"}' % h(new_point[:title])
+          points << new_point
+          result = '{"status":"success","message":"%s has been saved"}' % h(title)
         end
 
-        File.open(save_file, "w") do |f|
-          f.puts YAML.dump(points)
-        end
+        points.save_to_file(save_file)
       rescue Exception
-        result = '{"status":"message": "Failed to save point: %s"}' % h($!.to_s)
+        result = '{"status":"message","message":"Failed to save point: %s"}' % h($!.to_s)
       end
 
       result
@@ -267,12 +176,8 @@ module Travlrmap
 
       content_type :"application/json"
 
-      point = point_from_json(request.body.read)
-
-      result = {"yaml" => YAML.dump([point]).lines.to_a[1..-1].join,
-                "html" => erb(:"_point_comment", :layout => false, :locals => {:point => point})}
-
-      result.to_json
+      point = Util.point_from_json(request.body.read, @types)
+      point.preview.to_json
     end
 
     get '/images/*' do

data/lib/travlrmap/util.rb

@@ -0,0 +1,16 @@
+module Travlrmap
+  module Util
+    def self.kml_style_url(key, type)
+      "travlrmap-%s-%s" % [key, type]
+    end
+
+    def self.domain_from_url(url)
+      host = URI.parse(url).host.downcase
+      host.match(/^(en|www)\./) ? host.split(".")[1..-1].join(".") : host
+    end
+
+    def self.point_from_json(json, types)
+      Point.new(json, types, :json)
+    end
+  end
+end

data/lib/travlrmap/version.rb

@@ -1,3 +1,3 @@
 module Travlrmap
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/views/about.erb

@@ -13,6 +13,7 @@
 
     <ul>
       <li><a href="http://getbootstrap.com/">Bootstrap</a></li>
+      <li><a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a></li>
       <li><a href="https://hpneo.github.io/gmaps/">GMaps.js</a></li>
       <li><a href="https://developers.google.com/maps/">Google Maps</a></li>
       <li><a href="https://github.com/mahnunchik/markerclustererplus">Marker Clusterer Plus</a></li>

data/views/index.erb

@@ -6,5 +6,5 @@
   <img src="<%= settings[:icon] %>">&nbsp;<%= settings[:description] %>
 <% end %>
 <br />
-<%= @points.size %> locations in <%= @points.map{|p| p[:country]}.uniq.size %> countries
+<%= @points.size %> locations in <%= @points.countries.size %> countries
 </div>

data/views/layout.erb

@@ -13,7 +13,11 @@
     <script src="///ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="///maps.google.com/maps/api/js?sensor=true"></script>
     <script src="///maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
+<% if @map[:theme] == "css" %>
     <link rel="stylesheet" href="///maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
+<% else %>
+    <link rel="stylesheet" href="///maxcdn.bootstrapcdn.com/bootswatch/3.3.1/<%= @map[:theme] %>/bootstrap.min.css">
+<% end %>
     <link rel="stylesheet" href="/travlrmap.css">
     <link rel="stylesheet" href="/datepicker/datepicker3.css">
     <script src="/gmaps.js"></script>
@@ -28,8 +32,11 @@
   </head>
 
   <body>
-
+<% if @map[:theme] == "css" %>
     <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<% else %>
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<% end %>
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

metadata

@@ -1,346 +1,292 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: travlrmap
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-01-16 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ruby_kml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: gli
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: ruby_kml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 11
-        - 0
-        version: 0.11.0
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  type: :runtime
-  version_requirements: *id008
-description: "description: Sinatra based map builder"
+description: 'description: Sinatra based map builder'
 email: rip@devco.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
+- Gemfile.lock
+- config.ru
+- config/travlrmap.yaml.dist
 - lib/travlrmap.rb
-- lib/travlrmap/version.rb
+- lib/travlrmap/point.rb
+- lib/travlrmap/points.rb
 - lib/travlrmap/sinatra_app.rb
-- views/layout.erb
-- views/index.erb
-- views/_point_comment.erb
-- views/_google_analytics.erb
-- views/_map_types.erb
-- views/about.erb
-- views/_map_js.erb
-- views/geolocate.erb
-- public/travlrmap.css
-- public/favicon.ico
-- public/markerclusterer_compiled.js
-- public/gmaps.js
-- public/markers/marker-NAVY-MINI.png
-- public/markers/marker-NAVY-REGULAR.png
-- public/markers/marker-SILVER-MINI.png
-- public/markers/marker-PURPLE-LARGE.png
-- public/markers/marker-BLUE-MINI.png
-- public/markers/marker-ORANGE-LARGE.png
-- public/markers/marker-BLUE-LARGE.png
-- public/markers/marker-BLACK-MINI.png
-- public/markers/marker-FUCHSIA-MINI.png
-- public/markers/marker-ORANGE-REGULAR.png
-- public/markers/marker-BLACK-REGULAR.png
-- public/markers/marker-BLACK-LARGE.png
-- public/markers/marker-GREEN-MINI.png
-- public/markers/marker-OLIVE-LARGE.png
-- public/markers/marker-SILVER-LARGE.png
-- public/markers/marker-RED-REGULAR.png
-- public/markers/marker-TEAL-LARGE.png
-- public/markers/marker-GRAY-MINI.png
-- public/markers/marker-SILVER-REGULAR.png
-- public/markers/marker-MAROON-MINI.png
-- public/markers/marker-OLIVE-REGULAR.png
-- public/markers/marker-PURPLE-REGULAR.png
-- public/markers/marker-WHITE-MINI.png
-- public/markers/marker-OLIVE-MINI.png
-- public/markers/marker-WHITE-LARGE.png
-- public/markers/marker-YELLOW-LARGE.png
-- public/markers/marker-AQUA-REGULAR.png
-- public/markers/marker-FUCHSIA-REGULAR.png
-- public/markers/marker-ORANGE-MINI.png
-- public/markers/marker-TEAL-REGULAR.png
-- public/markers/marker-LIME-MINI.png
-- public/markers/marker-AQUA-LARGE.png
-- public/markers/marker-MAROON-REGULAR.png
-- public/markers/marker-FUCHSIA-LARGE.png
-- public/markers/marker-BLUE-REGULAR.png
-- public/markers/marker-LIME-REGULAR.png
-- public/markers/marker-WHITE-REGULAR.png
-- public/markers/marker-YELLOW-REGULAR.png
-- public/markers/marker-YELLOW-MINI.png
-- public/markers/marker-AQUA-MINI.png
-- public/markers/marker-GREEN-LARGE.png
-- public/markers/marker-LIME-LARGE.png
-- public/markers/marker-NAVY-LARGE.png
-- public/markers/marker-GRAY-LARGE.png
-- public/markers/marker-TEAL-MINI.png
-- public/markers/marker-GREEN-REGULAR.png
-- public/markers/marker-RED-LARGE.png
-- public/markers/marker-MAROON-LARGE.png
-- public/markers/marker-RED-MINI.png
-- public/markers/marker-PURPLE-MINI.png
-- public/markers/marker-GRAY-REGULAR.png
-- public/datepicker/datepicker3.css
-- public/datepicker/bootstrap-datepicker.js
-- public/cluster/cluster-ORANGE-2.png
-- public/cluster/cluster-YELLOW-1.png
-- public/cluster/cluster-TEAL-5.png
-- public/cluster/cluster-BLUE-2.png
-- public/cluster/cluster-YELLOW-4.png
-- public/cluster/cluster-BLACK-1.png
-- public/cluster/cluster-MAROON-1.png
+- lib/travlrmap/util.rb
+- lib/travlrmap/version.rb
+- public/cluster/cluster-AQUA-1.png
+- public/cluster/cluster-AQUA-2.png
+- public/cluster/cluster-AQUA-3.png
 - public/cluster/cluster-AQUA-4.png
-- public/cluster/cluster-TEAL-1.png
+- public/cluster/cluster-AQUA-5.png
+- public/cluster/cluster-BLACK-1.png
 - public/cluster/cluster-BLACK-2.png
-- public/cluster/cluster-MAROON-3.png
-- public/cluster/cluster-SILVER-1.png
-- public/cluster/cluster-MAROON-2.png
-- public/cluster/cluster-GRAY-5.png
-- public/cluster/cluster-YELLOW-2.png
-- public/cluster/cluster-WHITE-5.png
-- public/cluster/cluster-OLIVE-4.png
-- public/cluster/cluster-RED-4.png
-- public/cluster/cluster-PURPLE-3.png
-- public/cluster/cluster-ORANGE-4.png
-- public/cluster/m1.png
 - public/cluster/cluster-BLACK-3.png
-- public/cluster/cluster-LIME-1.png
-- public/cluster/cluster-YELLOW-5.png
-- public/cluster/cluster-AQUA-5.png
 - public/cluster/cluster-BLACK-4.png
+- public/cluster/cluster-BLACK-5.png
+- public/cluster/cluster-BLUE-1.png
+- public/cluster/cluster-BLUE-2.png
+- public/cluster/cluster-BLUE-3.png
+- public/cluster/cluster-BLUE-4.png
+- public/cluster/cluster-BLUE-5.png
+- public/cluster/cluster-FUCHSIA-1.png
+- public/cluster/cluster-FUCHSIA-2.png
+- public/cluster/cluster-FUCHSIA-3.png
+- public/cluster/cluster-FUCHSIA-4.png
+- public/cluster/cluster-FUCHSIA-5.png
 - public/cluster/cluster-GRAY-1.png
-- public/cluster/cluster-WHITE-2.png
-- public/cluster/cluster-WHITE-4.png
-- public/cluster/cluster-RED-1.png
-- public/cluster/cluster-OLIVE-5.png
-- public/cluster/cluster-MAROON-5.png
-- public/cluster/cluster-NAVY-3.png
-- public/cluster/cluster-TEAL-4.png
-- public/cluster/cluster-PURPLE-2.png
+- public/cluster/cluster-GRAY-2.png
+- public/cluster/cluster-GRAY-3.png
+- public/cluster/cluster-GRAY-4.png
+- public/cluster/cluster-GRAY-5.png
 - public/cluster/cluster-GREEN-1.png
-- public/cluster/cluster-YELLOW-3.png
-- public/cluster/cluster-AQUA-2.png
-- public/cluster/cluster-FUCHSIA-5.png
-- public/cluster/cluster-BLUE-5.png
-- public/cluster/cluster-LIME-2.png
-- public/cluster/cluster-BLUE-4.png
-- public/cluster/cluster-BLUE-1.png
-- public/cluster/cluster-SILVER-3.png
 - public/cluster/cluster-GREEN-2.png
-- public/cluster/cluster-RED-2.png
-- public/cluster/cluster-GRAY-4.png
-- public/cluster/cluster-RED-3.png
-- public/cluster/cluster-PURPLE-4.png
+- public/cluster/cluster-GREEN-3.png
 - public/cluster/cluster-GREEN-4.png
-- public/cluster/cluster-NAVY-5.png
-- public/cluster/cluster-TEAL-3.png
-- public/cluster/cluster-GRAY-3.png
-- public/cluster/cluster-BLUE-3.png
-- public/cluster/cluster-SILVER-5.png
-- public/cluster/cluster-ORANGE-5.png
-- public/cluster/cluster-FUCHSIA-4.png
+- public/cluster/cluster-GREEN-5.png
+- public/cluster/cluster-LIME-1.png
+- public/cluster/cluster-LIME-2.png
 - public/cluster/cluster-LIME-3.png
-- public/cluster/cluster-WHITE-1.png
-- public/cluster/cluster-NAVY-2.png
-- public/cluster/m4.png
 - public/cluster/cluster-LIME-4.png
-- public/cluster/cluster-SILVER-2.png
-- public/cluster/cluster-SILVER-4.png
-- public/cluster/cluster-WHITE-3.png
-- public/cluster/cluster-TEAL-2.png
-- public/cluster/cluster-RED-5.png
-- public/cluster/cluster-BLACK-5.png
-- public/cluster/m5.png
-- public/cluster/cluster-OLIVE-3.png
-- public/cluster/cluster-GRAY-2.png
+- public/cluster/cluster-LIME-5.png
+- public/cluster/cluster-MAROON-1.png
+- public/cluster/cluster-MAROON-2.png
+- public/cluster/cluster-MAROON-3.png
+- public/cluster/cluster-MAROON-4.png
+- public/cluster/cluster-MAROON-5.png
+- public/cluster/cluster-NAVY-1.png
+- public/cluster/cluster-NAVY-2.png
+- public/cluster/cluster-NAVY-3.png
 - public/cluster/cluster-NAVY-4.png
+- public/cluster/cluster-NAVY-5.png
 - public/cluster/cluster-OLIVE-1.png
 - public/cluster/cluster-OLIVE-2.png
+- public/cluster/cluster-OLIVE-3.png
+- public/cluster/cluster-OLIVE-4.png
+- public/cluster/cluster-OLIVE-5.png
 - public/cluster/cluster-ORANGE-1.png
-- public/cluster/cluster-AQUA-3.png
-- public/cluster/cluster-NAVY-1.png
-- public/cluster/cluster-FUCHSIA-2.png
-- public/cluster/cluster-FUCHSIA-3.png
-- public/cluster/cluster-AQUA-1.png
-- public/cluster/cluster-GREEN-5.png
-- public/cluster/m3.png
+- public/cluster/cluster-ORANGE-2.png
 - public/cluster/cluster-ORANGE-3.png
-- public/cluster/cluster-FUCHSIA-1.png
-- public/cluster/cluster-LIME-5.png
+- public/cluster/cluster-ORANGE-4.png
+- public/cluster/cluster-ORANGE-5.png
 - public/cluster/cluster-PURPLE-1.png
-- public/cluster/cluster-GREEN-3.png
-- public/cluster/m2.png
+- public/cluster/cluster-PURPLE-2.png
+- public/cluster/cluster-PURPLE-3.png
+- public/cluster/cluster-PURPLE-4.png
 - public/cluster/cluster-PURPLE-5.png
-- public/cluster/cluster-MAROON-4.png
+- public/cluster/cluster-RED-1.png
+- public/cluster/cluster-RED-2.png
+- public/cluster/cluster-RED-3.png
+- public/cluster/cluster-RED-4.png
+- public/cluster/cluster-RED-5.png
+- public/cluster/cluster-SILVER-1.png
+- public/cluster/cluster-SILVER-2.png
+- public/cluster/cluster-SILVER-3.png
+- public/cluster/cluster-SILVER-4.png
+- public/cluster/cluster-SILVER-5.png
+- public/cluster/cluster-TEAL-1.png
+- public/cluster/cluster-TEAL-2.png
+- public/cluster/cluster-TEAL-3.png
+- public/cluster/cluster-TEAL-4.png
+- public/cluster/cluster-TEAL-5.png
+- public/cluster/cluster-WHITE-1.png
+- public/cluster/cluster-WHITE-2.png
+- public/cluster/cluster-WHITE-3.png
+- public/cluster/cluster-WHITE-4.png
+- public/cluster/cluster-WHITE-5.png
+- public/cluster/cluster-YELLOW-1.png
+- public/cluster/cluster-YELLOW-2.png
+- public/cluster/cluster-YELLOW-3.png
+- public/cluster/cluster-YELLOW-4.png
+- public/cluster/cluster-YELLOW-5.png
+- public/cluster/m1.png
+- public/cluster/m2.png
+- public/cluster/m3.png
+- public/cluster/m4.png
+- public/cluster/m5.png
+- public/datepicker/bootstrap-datepicker.js
+- public/datepicker/datepicker3.css
+- public/favicon.ico
+- public/gmaps.js
+- public/markerclusterer_compiled.js
+- public/markers/marker-AQUA-LARGE.png
+- public/markers/marker-AQUA-MINI.png
+- public/markers/marker-AQUA-REGULAR.png
+- public/markers/marker-BLACK-LARGE.png
+- public/markers/marker-BLACK-MINI.png
+- public/markers/marker-BLACK-REGULAR.png
+- public/markers/marker-BLUE-LARGE.png
+- public/markers/marker-BLUE-MINI.png
+- public/markers/marker-BLUE-REGULAR.png
+- public/markers/marker-FUCHSIA-LARGE.png
+- public/markers/marker-FUCHSIA-MINI.png
+- public/markers/marker-FUCHSIA-REGULAR.png
+- public/markers/marker-GRAY-LARGE.png
+- public/markers/marker-GRAY-MINI.png
+- public/markers/marker-GRAY-REGULAR.png
+- public/markers/marker-GREEN-LARGE.png
+- public/markers/marker-GREEN-MINI.png
+- public/markers/marker-GREEN-REGULAR.png
+- public/markers/marker-LIME-LARGE.png
+- public/markers/marker-LIME-MINI.png
+- public/markers/marker-LIME-REGULAR.png
+- public/markers/marker-MAROON-LARGE.png
+- public/markers/marker-MAROON-MINI.png
+- public/markers/marker-MAROON-REGULAR.png
+- public/markers/marker-NAVY-LARGE.png
+- public/markers/marker-NAVY-MINI.png
+- public/markers/marker-NAVY-REGULAR.png
+- public/markers/marker-OLIVE-LARGE.png
+- public/markers/marker-OLIVE-MINI.png
+- public/markers/marker-OLIVE-REGULAR.png
+- public/markers/marker-ORANGE-LARGE.png
+- public/markers/marker-ORANGE-MINI.png
+- public/markers/marker-ORANGE-REGULAR.png
+- public/markers/marker-PURPLE-LARGE.png
+- public/markers/marker-PURPLE-MINI.png
+- public/markers/marker-PURPLE-REGULAR.png
+- public/markers/marker-RED-LARGE.png
+- public/markers/marker-RED-MINI.png
+- public/markers/marker-RED-REGULAR.png
+- public/markers/marker-SILVER-LARGE.png
+- public/markers/marker-SILVER-MINI.png
+- public/markers/marker-SILVER-REGULAR.png
+- public/markers/marker-TEAL-LARGE.png
+- public/markers/marker-TEAL-MINI.png
+- public/markers/marker-TEAL-REGULAR.png
+- public/markers/marker-WHITE-LARGE.png
+- public/markers/marker-WHITE-MINI.png
+- public/markers/marker-WHITE-REGULAR.png
+- public/markers/marker-YELLOW-LARGE.png
+- public/markers/marker-YELLOW-MINI.png
+- public/markers/marker-YELLOW-REGULAR.png
 - public/moment.js
-- config/travlrmap.yaml.dist
-- config.ru
-- Gemfile
-- Gemfile.lock
-has_rdoc: true
+- public/travlrmap.css
+- views/_google_analytics.erb
+- views/_map_js.erb
+- views/_map_types.erb
+- views/about.erb
+- views/geolocate.erb
+- views/index.erb
+- views/layout.erb
 homepage: http://devco.net/
-licenses: []
-
+licenses:
+- Apache-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: travlrmap
 test_files: []
-

data/views/_point_comment.erb

@@ -1,26 +0,0 @@
-<p>
-<font size="+2"><%= point[:title] %></font>
-<hr>
-<% if point[:comment] %>
-<%=  h point[:comment] %><br /><br />
-<% end %>
-
-<% if point[:href]  %>
-     <a href='<%= point[:href] %>' target='_blank'>
-<% end %>
-<% if point[:linkimg] || point[:linktext] %>
-<%   if point[:linkimg] %>
-       <img src='<%= point[:linkimg] %>'><br />
-<%   end %>
-<%   if point[:linktext] %>
-       <%= h point[:linktext] %>
-<%   end %>
-<% elsif point[:href] %>
-     <%= domain_from_url(point[:href]) %>
-<% end %>
-<% if point[:href]  %>
-     </a>
-<% end %>
-</p>
-<p>
-<font weight"-2"><%= h @types[ point[:type] ][:description] %><% if point[:date] %> on <%= h point[:date] %><% end %>