adiwg-mdtranslator 1.4.0.beta11 → 1.4.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 691860324975f9aaa2aa9ba8a6db68cc9131a1f0
-  data.tar.gz: 0d93a0f30b01bb3119291053f29ecfeb68557e9d
+  metadata.gz: a3c8340795820ae5a7bd9d80cfeee5a0dfacd33f
+  data.tar.gz: 9d0f3b6578f3b365921d7cee86caf536c6f3904d
 SHA512:
-  metadata.gz: 977f19681d1405f235f6502119808942cebcc368d0b7431a9bf429c1945066cce43d815387aaa63eefa5dd3b038fef39e64136d3f45f74e59b0fe931778c4349
-  data.tar.gz: 718412b6341ad3634ef9926880e3645c0d3b5709a23d45e106941e05d3d39265438feb0ee662f7f62b42c494634b2fffbfdd166845688cf05d43feb1abcab832
+  metadata.gz: eadde1287ff2a4767ab788e9aad301fb14ddb3953838be5182d08cd073b7cca96f814a17069f4d648fff76e5d9f97ead4b99d2f255c8536a247fd98332a93305
+  data.tar.gz: 27c73bb6fb90ae5d9d5cda1bacd474c7eda810e9b3607933b7dbd123ecfed5b894194eb7dbb3bca0e64150ed7f4a0be4605bba828bf1b2f0f3bd639f35436b8c

data/lib/adiwg/mdtranslator/version.rb

@@ -61,6 +61,6 @@
 module ADIWG
     module Mdtranslator
         # current mdtranslator version
-        VERSION = "1.4.0.beta11"
+        VERSION = "1.4.0.beta12"
     end
 end

data/lib/adiwg/mdtranslator/writers/html/sections/html_body.rb

@@ -253,8 +253,9 @@ module ADIWG
                             @html.hr
 
                             #Load leaflet
-                            @html.link( :rel => 'stylesheet', :href => 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css')
-                            @html.script('', :src => 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js')
+                            @html.link( :rel => 'stylesheet', :href => 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css')
+                            @html.script('', :src => 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js')
+                            @html.script('', :src => 'http://maps.stamen.com/js/tile.stamen.js?v1.3.0')
 
                             # add inline javascript
                             # read javascript from file

data/lib/adiwg/mdtranslator/writers/html/sections/html_bodyScript.js

@@ -4,7 +4,7 @@ if ( typeof L === "object") {
         if (!Array.prototype.forEach) {
             Array.prototype.forEach = function(callback, thisArg) {
                 var T, k;
-                if (this == null) {
+                if (this === null || this === undefined) {
                     throw new TypeError(' this is null or not defined');
                 }
                 var O = Object(this);
@@ -27,10 +27,21 @@ if ( typeof L === "object") {
             };
         }
 
+        var coordsToLatLng = function(coords) {
+          var longitude = coords[0];
+          var latitude = coords[1];
+          var latlng = L.latLng(latitude, longitude);
+
+          if (longitude < 0) {
+            return latlng.wrap(360, 0);
+          } else
+            return latlng;
+        };
+
         var extentNodeList = document.querySelectorAll('section.extent-section');
         var extents = Array.prototype.slice.call(extentNodeList);
 
-        var mqAttr = '<span>Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png"></span>';
+        /*var mqAttr = '<span>Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png"></span>';
         var osmAttr = '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>';
 
         L.TileLayer.OSM = L.TileLayer.extend({
@@ -41,7 +52,7 @@ if ( typeof L === "object") {
                     attribution: 'Map data ' + osmAttr + ', ' + mqAttr
                 });
             }
-        });
+        });*/
 
         var check = function(i, me, bnds) {
             if (i < 3) {
@@ -75,9 +86,21 @@ if ( typeof L === "object") {
                 }
 
                 if (json.geometry === null && bbox) {
+                    var bcoor;
+
+                    if (!(bbox[0] <= 0 && bbox[2] <= 0) || !(bbox[0] > 0 && bbox[2] > 0)) {
+                        //bbox crosses the dateline
+                        var bbox0 = bbox[0] < 0 ? L.latLng(0, bbox[0]).wrap(360,0).lng : bbox[0];
+                        var bbox2 = bbox[2] < 0 ? L.latLng(0, bbox[2]).wrap(360,0).lng : bbox[2];
+                        bbox[0] = Math.min(bbox0, bbox2);
+                        bbox[2] = Math.max(bbox0, bbox2);
+                    }
+
+                    bcoor = [[[bbox[2], bbox[3]], [bbox[0], bbox[3]], [bbox[0], bbox[1]], [bbox[2], bbox[1]], [bbox[2], bbox[3]]]];
+
                     json.geometry = {
                         "type": "Polygon",
-                        "coordinates": [[[bbox[2], bbox[3]], [bbox[0], bbox[3]], [bbox[0], bbox[1]], [bbox[2], bbox[1]], [bbox[2], bbox[3]]]]
+                        "coordinates": bcoor
                     };
                     json.properties.style = {
                         color: '#f00',
@@ -93,6 +116,7 @@ if ( typeof L === "object") {
                 style: function(feature) {
                     return feature.properties.style || {};
                 },
+                coordsToLatLng: coordsToLatLng,
                 onEachFeature: function (feature, layer) {
                     layer.bindPopup(feature.properties.popup,{
                         closeButton: true
@@ -123,7 +147,9 @@ if ( typeof L === "object") {
             }, map);
 
             map.fitBounds(bnds);
-            map.addLayer(new L.TileLayer.OSM());
+            //map.addLayer(new L.TileLayer.OSM());
+            var stamen = new L.StamenTileLayer("terrain");
+            map.addLayer(stamen);
         });
     })();
-}
+}

data/lib/adiwg/mdtranslator/writers/html/sections/html_headScript.js

@@ -1,6 +1,6 @@
 
     function closeAllDetails(){
-        var arr = document.getElementsByTagName("details")
+        var arr = document.getElementsByTagName("details");
         var len = arr.length;
 
         for(var i=0; i < len; i++){
@@ -9,7 +9,7 @@
     }
 
     function openAllDetails(){
-        var arr = document.getElementsByTagName("details")
+        var arr = document.getElementsByTagName("details");
         var len = arr.length;
 
         for(var i=0; i < len; i++){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta11
+  version: 1.4.0.beta12
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -563,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata