leafleter 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9c6d60b6b959f1ab7ab8be9c9f6e3adbfca92bb
-  data.tar.gz: 972f1b767052555e2eb225a06f005ac2120c7e23
+SHA256:
+  metadata.gz: e09918bea7239e6340a66c76179c7dfd1d34b2fceac52e5a3f3640280c88d31a
+  data.tar.gz: fb5feca876bcaa68919ffc68543b2036ff3ee01ca2275d94b963f72e02761729
 SHA512:
-  metadata.gz: c07eccee9534c1cb6000f9c97c8de70277808da761f6b2b81defbc48f26fa1ddc9eefd7ef92c7bd775527d3b395b6f66117c70d7ec1c9ec66db3459a717b247c
-  data.tar.gz: ed41b9a0c44f928f2297b7e57a404c0fc15fd771bd6cc91a0611f89926af75de04502daa61e82f306586be3ad05e5797a5c5b40db5e872961f96ac9db317382b
+  metadata.gz: 0a3edea1d98195a21e0e810e14a1935e44ba0f0ea77dfc38fdaabcd23e10b3692b40cb4bec511a97ee022ef2e9545fe8547a1be09b1ba34b9e1d896e0fc249bf
+  data.tar.gz: d9319111b748a6562c4f70f1298929b6c52f0993978c7567372c746361f7708b012a0d9a0cd38fb3e6defd5ef2c4f93e92f6f432ac9a0001abe9ad3606496d5f

data/lib/leafleter.rb

@@ -2,18 +2,30 @@ class Leafleter
   # consider importing more from http://leaflet-extras.github.io/leaflet-providers/preview/
   # or using this extension
   def self.openstreetmap_copyright_notice
-    'data: &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    return 'data: &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
   end
 
-  def self.get_positron_tile_Layer
+  def self.get_grayscale_tile_layer
+    return self.get_positron_tile_layer
+  end
+
+  def self.get_positron_tile_layer
     return "L.tileLayer('https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
         attribution: '#{openstreetmap_copyright_notice}, basemap: &copy; <a href=\"http://cartodb.com/attributions\">CartoDB</a>',
         subdomains: 'abcd',
         maxZoom: 19
     })"
+ end
+
+  def self.get_gray_transformed_osm_carto_tile_layer
+      return "L.tileLayer('https://tiles.wmflabs.org/bw-mapnik/${z}/${x}/${y}.png', {
+        attribution: '#{openstreetmap_copyright_notice}',
+        subdomains: 'abcd',
+        maxZoom: 19
+    })"
   end
 
-  def self.get_standard_OSM_tile_Layer
+  def self.get_standard_OSM_tile_layer
     return "L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
         attribution: '#{openstreetmap_copyright_notice}, basemap made by <a href=\"https://github.com/gravitystorm/openstreetmap-carto/\">openstreetmap-carto project</a>',
         subdomains: 'abc',
@@ -40,7 +52,46 @@ class Leafleter
   crossorigin=""></script>'
   end
 
-  def self.get_html_page_prefix(title, lat_centered, lon_centered, zlevel_centered = 13, tile_layer = get_standard_OSM_tile_Layer, width_percent = 100, sidebar_content = "", css = nil)
+  def self.map_area_part_of_styling(width_percent)
+    return "        body {
+      padding: 0;
+      margin: 0;
+  }
+  html, body {
+      height: 100%;
+      width: 100%;
+  }
+  #map {
+      height: 100%;
+      width: #{width_percent}%;
+      float: left;
+  }"
+    if width_percent != 100
+      returned += "
+#pane {
+height: 100%;
+width: #{100 - width_percent}%;
+float: right;
+}"
+    end
+  end
+
+  def self.internal_leaflet_styling_part()
+    # workaround for https://github.com/Leaflet/Leaflet/issues/4686
+    return "\n .leaflet-fade-anim .leaflet-tile,.leaflet-zoom-anim .leaflet-zoom-animated { will-change:auto !important; }"
+  end
+
+  def self.get_html_page_prefix(title, lat_centered, lon_centered, zlevel_centered: 13, tile_layer: get_standard_OSM_tile_layer, width_percent: 100, sidebar_content: "", css: nil)
+    # asserts for parameters, I wasted over 1 hour on bug that would be caught by this
+    zlevel_centered.to_f
+    lat_centered.to_f
+    lon_centered.to_f
+    width_percent.to_f
+    raise if width_percent > 100
+    raise if width_percent < 100
+    raise if zlevel_centered <= 0
+    ######
+
     returned = "
     #{get_standard_prefix_of_any_html_page(title)}
     #{get_leaflet_dependencies}
@@ -48,30 +99,11 @@ class Leafleter
     unless css.nil?
       returned += '<link rel="stylesheet" type="text/css" href="' + css + '" />'
     end
-    returned += "<style>
-        body {
-            padding: 0;
-            margin: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-        #map {
-            height: 100%;
-            width: #{width_percent}%;
-            float: left;
-        }"
-    if width_percent != 100
-      returned += "
-  #pane {
-      height: 100%;
-      width: #{100 - width_percent}%;
-      float: right;
-  }"
-        end
+    returned += "<style>"
+    returned += self.map_area_part_of_styling(width_percent)
+    returned += self.internal_leaflet_styling_part()
     returned +=
-      "    </style>
+      "\n    </style>
       </head>
       <body>
         <div id=\"map\"></div><div id=\"pane\">#{sidebar_content}</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leafleter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matkoniecz-ruby-style
@@ -53,8 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Generator of Leaflet maps.