travlrmap 1.2.0 → 1.3.0

data/lib/travlrmap/sinatra_app.rb

@@ -26,6 +26,11 @@ module Travlrmap
 
       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"'

data/lib/travlrmap/version.rb

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

data/views/_point_comment.erb

@@ -7,16 +7,18 @@
 
 <% if point[:href]  %>
      <a href='<%= point[:href] %>' target='_blank'>
-<%   if point[:linkimg] || point[:linktext] %>
-<%      if point[:linkimg] %>
-          <img src='<%= point[:linkimg] %>'><br />
-<%      end %>
-<%      if point[:linktext] %>
-          <%= h point[:linktext] %>
-<%      end %>
-<%   else %>
-       Link
+<% 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>

data/views/geolocate.erb

@@ -3,12 +3,16 @@
     <div class="col-md-9">
       <input type="text" class="form-control" id="location" autofocus>
     </div>
-    <div class="col-md-1">
+    <div class="col-md-3">
       <button type="submit" class="btn btn-primary">Search</button>
+      <button type="button" id="my_location" class="btn btn-primary">My Location</button>
     </div>
   </form>
 </div>
 <div class="row"><div class="col-md-12">&nbsp;</div></div>
+<div class="row">
+  <div class="col-md-9"><center>Perform a search to place a marker or right click to place one anywhere.</center></div>
+</div>
 <div class="row" style="height: 80%">
   <div class="col-md-9" style="height: 100%">
     <div class="map" id="main_map"> </div>
@@ -49,9 +53,6 @@
     </form>
   </div>
 </div>
-<div class="row">
-  <div class="col-md-9"><center>Perform a search to place a marker or right click to place one anywhere.</center></div>
-</div>
 
 <script src="/moment.js"></script>
 <script src="/datepicker/bootstrap-datepicker.js"></script>
@@ -64,11 +65,7 @@
       var addrComponents = results[0].address_components;
 
       for (var i = 0; i < addrComponents.length; i++) {
-        if (addrComponents[i].types[0] == "point_of_interest") {
-          return addrComponents[i].long_name;
-        }
-
-        if (addrComponents[i].types[0] == "postal_town") {
+        if ($.inArray(addrComponents[i].types[0], ["establishment", "point_of_interest", "postal_town", "locality"])) {
           return addrComponents[i].long_name;
         }
       }
@@ -108,7 +105,6 @@
 
         document.getElementById('point_title').value = getLocationName(results);
         document.getElementById('point_country').value = getCountry(results);
-        document.getElementById('point_date').value = moment().format("YYYY-MM-DD");
       } else {
         alert("Geocode was not successful for the following reason: " + status);
       }
@@ -155,6 +151,22 @@
       });
     }
 
+    function updateWithCurrentPosition(pos) {
+      map.removeMarkers();
+
+      GMaps.geocode({
+        lat: pos.coords.latitude,
+        lng: pos.coords.longitude,
+        callback: function(results, status) {
+          updateForm(results, status, true)
+        }
+      });
+    }
+
+    function errorGettingCurrentPos(error) {
+      alert("Could not get current position: " + err.message);
+    }
+
     $(document).ready(function() {
       $('#point_date').datepicker({
         format: 'yyyy-mm-dd',
@@ -196,6 +208,14 @@
         selectText('preview_yaml');
       };
 
+      document.getElementById('my_location').onclick = function() {
+        if (navigator.geolocation) {
+          navigator.geolocation.getCurrentPosition(updateWithCurrentPosition, errorGettingCurrentPos);
+        } else {
+          alert("Optaining your position is not supported with this browser");
+        }
+      };
+
       $('#point_info').submit(function(e) {
         e.preventDefault();
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: travlrmap
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-13 00:00:00 +00:00
+date: 2015-01-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency