natour 0.8.0 → 0.10.0

data/lib/natour/data/themes/natour-theme.yml

@@ -8,7 +8,9 @@ font:
       bold: dejavuserifcondensed-bold.ttf
       bold_italic: dejavuserifcondensed-bold_italic.ttf
 base:
-  font-family: DejaVu Serif Condensed
+  font_family: DejaVu Serif Condensed
+heading:
+  min_height_after: auto
 footer:
   recto:
     left:

data/lib/natour/map_geo_admin.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'pathname'
 require 'uri'
 require 'webrick'
+require 'webrick/https'
 
 module Natour
   class MapGeoAdmin
@@ -11,21 +12,29 @@ module Natour
       @doc_root = Pathname(Dir.mktmpdir)
       FileUtils.cp_r("#{__dir__}/data/js", @doc_root)
       event = Concurrent::Event.new
-      @server = WEBrick::HTTPServer.new(
-        StartCallback: -> { event.set },
-        Logger: WEBrick::Log.new(File.open(File::NULL, 'w')),
-        AccessLog: [],
-        DocumentRoot: @doc_root,
-        BindAddress: 'localhost',
-        Port: port
-      )
+      @server = StdoutUtils.suppress_output do
+        WEBrick::HTTPServer.new(
+          StartCallback: -> { event.set },
+          Logger: WEBrick::Log.new(File.open(File::NULL, 'w')),
+          AccessLog: [],
+          DocumentRoot: @doc_root,
+          BindAddress: 'localhost',
+          Port: port,
+          SSLEnable: true,
+          SSLCertName: [%w[CN localhost]]
+        )
+      end
       @server.mount('/map', MapServlet)
       @thread = Thread.new { @server.start }
       event.wait
       @browser = Ferrum::Browser.new(
         slowmo: 2.0,
+        timout: 30,
         window_size: [5000, 5000],
-        browser_options: { 'no-sandbox': nil }
+        browser_options: {
+          'no-sandbox': nil,
+          'ignore-certificate-errors': nil
+        }
       )
     end
 
@@ -36,11 +45,12 @@ module Natour
       FileUtils.remove_entry(@doc_root)
     end
 
-    def save_image(filename, overwrite: false, gps_files: [], map_layers: [], image_size: [1200, 900])
+    def save_image(filename, overwrite: false, gps_files: [], gps_colors: [], map_layers: [], image_size: [1200, 900])
       FileUtils.cp(gps_files, @doc_root)
-      uri = URI("http://#{@server[:BindAddress]}:#{@server[:Port]}/map")
+      uri = URI("https://#{@server[:BindAddress]}:#{@server[:Port]}/map")
       uri.query = URI.encode_www_form(
         'gps-files': gps_files.map { |gps_file| Pathname(gps_file).basename }.join(','),
+        'gps-colors': gps_colors.join(','),
         'map-layers': map_layers.join(','),
         'map-size': image_size.map { |dim| dim.is_a?(String) ? dim : "#{dim}px" }.join(',')
       )
@@ -73,8 +83,10 @@ module Natour
         raise WEBrick::HTTPStatus::NotFound unless request.path == '/map'
 
         files = request.query.fetch('gps-files', '').split(',')
-        layers = request.query.fetch('map-layers', '').split(',')
-        layers.unshift('ch.swisstopo.pixelkarte-farbe')
+        colors = request.query.fetch('gps-colors', '').split(',')
+        (files.size - colors.size).times { colors << (colors.last || 'blueviolet') }
+        layers = ['ch.swisstopo.pixelkarte-farbe']
+        layers |= request.query.fetch('map-layers', '').split(',')
 
         width, height = request.query.fetch('map-size', '').split(',')
         raise WEBrick::HTTPStatus::BadRequest unless width && height
@@ -87,54 +99,57 @@ module Natour
         doc << '<script src="js/loader.js"></script>'
         doc << '<script type="text/javascript">'
         doc << '  $(function() {'
-        doc << '    var map = new ga.Map({'
+        doc << '    let map = new ga.Map({'
         doc << '      controls: [],'
         doc << '      target: "map",'
         doc << '      view: new ol.View()'
         doc << '    })'
-        doc << "    var layers = [#{layers.map { |layer| "\"#{layer}\"" }.join(', ')}]"
+        doc << "    let layers = [#{layers.map { |layer| "\"#{layer}\"" }.join(', ')}]"
         doc << '    layers.forEach(function(layer) {'
         doc << '      map.addLayer(ga.layer.create(layer))'
         doc << '    })'
-        doc << '    var styles = {'
-        doc << '      "Point": new ol.style.Style({'
-        doc << '        image: new ol.style.Circle({'
-        doc << '          fill: new ol.style.Fill({'
-        doc << '            color: function() {'
-        doc << '              var color = "blueviolet"'
-        doc << '              var alpha = 0.3'
-        doc << '              var [r, g, b] = ol.color.asArray(color)'
-        doc << '              return ol.color.asString([r, g, b, alpha])'
-        doc << '            }()'
-        doc << '          }),'
-        doc << '          radius: 6,'
+        doc << '    let getStyles = function(color) {'
+        doc << '      return {'
+        doc << '        "Point": new ol.style.Style({'
+        doc << '          image: new ol.style.Circle({'
+        doc << '            fill: new ol.style.Fill({'
+        doc << '              color: function() {'
+        doc << '                let [r, g, b, a] = ol.color.asArray(color)'
+        doc << '                a = 0.3'
+        doc << '                return ol.color.asString([r, g, b, a])'
+        doc << '              }()'
+        doc << '            }),'
+        doc << '            radius: 6,'
+        doc << '            stroke: new ol.style.Stroke({'
+        doc << '              color: color,'
+        doc << '              width: 1.5'
+        doc << '            })'
+        doc << '          })'
+        doc << '        }),'
+        doc << '        "LineString": new ol.style.Style({'
         doc << '          stroke: new ol.style.Stroke({'
-        doc << '            color: "blueviolet",'
-        doc << '            width: 1.5'
+        doc << '            color: color,'
+        doc << '            width: 3'
+        doc << '          })'
+        doc << '        }),'
+        doc << '        "MultiLineString": new ol.style.Style({'
+        doc << '          stroke: new ol.style.Stroke({'
+        doc << '            color: color,'
+        doc << '            width: 3'
         doc << '          })'
         doc << '        })'
-        doc << '      }),'
-        doc << '      "LineString": new ol.style.Style({'
-        doc << '        stroke: new ol.style.Stroke({'
-        doc << '          color: "blueviolet",'
-        doc << '          width: 3'
-        doc << '        })'
-        doc << '      }),'
-        doc << '      "MultiLineString": new ol.style.Style({'
-        doc << '        stroke: new ol.style.Stroke({'
-        doc << '          color: "blueviolet",'
-        doc << '          width: 3'
-        doc << '        })'
-        doc << '      })'
+        doc << '      }'
         doc << '    }'
-        doc << "    var files = [#{files.map { |file| "\"#{file}\"" }.join(', ')}]"
-        doc << '    var vectors = files.map(function(file) {'
+        doc << "    let sources = [#{files.zip(colors)
+                                          .map { |file, color| "{ file: \"#{file}\", color: \"#{color}\" }" }
+                                          .join(', ')}]"
+        doc << '    let vectors = sources.map(function(source) {'
         doc << '      return new ol.layer.Vector({'
         doc << '        source: new ol.source.Vector({'
         doc << '          format: function() {'
-        doc << '            if (file.endsWith(".gpx")) {'
+        doc << '            if (source.file.endsWith(".gpx")) {'
         doc << '              return new ol.format.GPX()'
-        doc << '            } else if (file.endsWith(".kml")) {'
+        doc << '            } else if (source.file.endsWith(".kml")) {'
         doc << '              return new ol.format.KML({'
         doc << '                extractStyles: false'
         doc << '              })'
@@ -142,17 +157,17 @@ module Natour
         doc << '              return null'
         doc << '            }'
         doc << '          }(),'
-        doc << '          url: file'
+        doc << '          url: source.file'
         doc << '        }),'
         doc << '        style: function(feature) {'
-        doc << '          return styles[feature.getGeometry().getType()]'
+        doc << '          return getStyles(source.color)[feature.getGeometry().getType()]'
         doc << '        }'
         doc << '      })'
         doc << '    })'
         doc << '    vectors.forEach(function(vector) {'
         doc << '      map.addLayer(vector)'
         doc << '      vector.getSource().on("change", function(evt) {'
-        doc << '        var extent = ol.extent.createEmpty()'
+        doc << '        let extent = ol.extent.createEmpty()'
         doc << '        vectors.forEach(function(vector) {'
         doc << '          ol.extent.extend(extent, vector.getSource().getExtent())'
         doc << '        })'

data/lib/natour/utils/errno_utils.rb

@@ -3,7 +3,9 @@ module Natour
     module_function
 
     def split_message(error)
-      error.message.split(/ @ | - /, 3)
+      tokens = error.message.split(/ @ | - /, 3)
+      tokens.insert(1, *[nil] * (3 - tokens.size))
+      tokens
     end
   end
 end

data/lib/natour/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Natour
-  VERSION = '0.8.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2023-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement