maplibre-preview 1.1.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f628d2aac593618e8775a688086609010893a9ca6191dcade5ba61a9254f0517
-  data.tar.gz: 2de4ff80fe3ba39d4b80d1340b49484a5fa35eee47200db2abff869fa8bd0233
+  metadata.gz: c014b48eb6865531f00686bfefe9994d6a3a13c6f1b489db0108b685cb265cb1
+  data.tar.gz: 06acc3ebcb2854e37781a1fc37859e5b114f0a51f2c3123498aa251c7f8a7758
 SHA512:
-  metadata.gz: a8a63f3fd6948997cc2f789afac439cc25d434281a44c10912b0ad662084fd22cbcaa7013b5284e3b1700c7c3f6f80dee806fbe82d7972e9be0bae840b0fa1fc
-  data.tar.gz: cf4a12c6f6176b60f360bd9d753050e9ac07b728ea981c8985aa217ace3828a5fa81dc962320fef7f3cde3e7a9d9c905baad6b2d17eb84e20b8416312d96e334
+  metadata.gz: '0019e4a9dcc04d061ac10cb0742b45a1a65da75e6e777b4c98be3f660d135f85add8bbbf8d4f31cf08fb407fc68501742b90ecd681aa4e239b6b27a8367e093f'
+  data.tar.gz: 504f58c1450d8b6e569f48b5bf6ee6df496edd2a87cf61f5d76597cdcf3c54d1bcd86978c7dea3d89769537667201f4acfc48a364629f03982b08839ab01390c

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [1.2.4] - 2025-10-05
+
+### Added
+- **CLI executable** - completely new `bin/maplibre-preview` command-line interface
+- **Server management commands** with `--up`, `--down`, `--port` options
+- **Help system** with `--help` and `--version` commands
+- **Process management** with PID file tracking and server control
+- **Puma dependency** for reliable server operation
+- **Ruby 3.0+ requirement** for modern Ruby features
+
+### New CLI Features
+- **`maplibre-preview --up`** - start server with default or custom port
+- **`maplibre-preview --up --port 9292`** - start server on specific port
+- **`maplibre-preview --down`** - stop running server
+- **`maplibre-preview --help`** - show usage information
+- **`maplibre-preview --version`** - show version information
+- **Unknown command validation** - proper error messages for invalid arguments
+
+## [1.1.4] - 2025-10-03
+
+### Fixed
+- **Terrain elevation correction** for accurate height display in tooltips and profiles
+- **Centralized exaggeration compensation** with `getRealTerrainElevation` function
+
 ## [1.1.0] - 2025-10-01
 
 ### Refactored

data/bin/maplibre-preview

@@ -0,0 +1,144 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'maplibre-preview'
+require 'optparse'
+require 'json'
+require 'fileutils'
+
+class MapLibrePreviewCLI
+  PID_FILE = File.join(Dir.home, '.maplibre-preview.pid')
+
+  def initialize
+    @options = { port: 4567, up: false }
+    setup_parser
+  end
+
+  def run
+    @parser.parse!
+
+    unless ARGV.empty?
+      puts "Error: Unknown argument(s): #{ARGV.join(', ')}"
+      puts "Use 'maplibre-preview --help' for available options"
+      exit 1
+    end
+
+    return handle_server_stop if @options[:stop]
+    return handle_already_running if server_running?
+
+    if @options[:up]
+      start_server
+    else
+      puts "MapLibre Preview v#{MapLibrePreview::VERSION}"
+      puts "Use 'maplibre-preview --up' to start the server"
+      puts "Use 'maplibre-preview --help' for more options"
+      exit 0
+    end
+  rescue OptionParser::InvalidOption => e
+    puts "Error: #{e.message}"
+    puts "Use 'maplibre-preview --help' for available options"
+    exit 1
+  rescue Interrupt
+    puts "\nShutting down server"
+    cleanup_server_info
+    exit 0
+  end
+
+  private
+
+  def setup_parser
+    @parser = OptionParser.new do |opts|
+      opts.banner = "MapLibre Preview v#{MapLibrePreview::VERSION}"
+      opts.separator ""
+      opts.separator "Usage: maplibre-preview [OPTIONS]"
+      opts.separator ""
+      opts.separator "Options:"
+
+      opts.on("--up", "Start the server") { @options[:up] = true }
+      opts.on("-p", "--port PORT", Integer, "Port to run on (default: 4567)") { |port| @options[:port] = port }
+      opts.on("--down", "Stop the running server") { @options[:stop] = true }
+      opts.on("-h", "--help", "Show this help message") { puts opts; exit 0 }
+      opts.on("--version", "Show version information") { puts "MapLibre Preview v#{MapLibrePreview::VERSION}"; exit 0 }
+    end
+  end
+
+  def handle_server_stop
+    return puts("No server is currently running") unless server_running?
+
+    puts "Stopping server on port #{server_info&.dig('port')}"
+    kill_server_process ? puts("Server stopped successfully") : puts("Could not stop server automatically")
+    cleanup_server_info
+  end
+
+  def handle_already_running
+    puts "Server already running on port #{server_info&.dig('port')}"
+    puts "Use 'maplibre-preview --down' to stop it first"
+    exit 1
+  end
+
+  def start_server
+    puts "MapLibre Preview v#{MapLibrePreview::VERSION}"
+    puts "Starting server on port #{@options[:port]}"
+    puts "Open: http://localhost:#{@options[:port]}"
+    puts "Press Ctrl+C to stop"
+    puts ""
+
+    save_server_info(@options[:port])
+    MapLibrePreview::App.run!(port: @options[:port], host: '0.0.0.0')
+  end
+
+  def server_running?
+    return false unless File.exist?(PID_FILE)
+
+    process_exists?(server_info&.dig('pid'))
+  rescue
+    cleanup_server_info
+    false
+  end
+
+  def server_info
+    @server_info ||= begin
+                       return nil unless File.exist?(PID_FILE)
+                       JSON.parse(File.read(PID_FILE))
+                     rescue
+                       cleanup_server_info
+                       nil
+                     end
+  end
+
+  def save_server_info(port)
+    server_info = { 'port' => port, 'pid' => Process.pid, 'started_at' => Time.now.to_i }
+    File.write(PID_FILE, JSON.pretty_generate(server_info))
+  end
+
+  def cleanup_server_info
+    File.delete(PID_FILE) if File.exist?(PID_FILE)
+    @server_info = nil
+  end
+
+  def kill_server_process
+    return false unless server_info&.dig('pid')
+
+    pid = server_info['pid']
+    return false unless process_exists?(pid)
+
+    Process.kill('TERM', pid)
+    sleep(1)
+    Process.kill('KILL', pid) if process_exists?(pid)
+    true
+  rescue => e
+    puts "Warning: Could not kill process: #{e.message}"
+    false
+  end
+
+  def process_exists?(pid)
+    return false unless pid
+
+    Process.kill(0, pid)
+    true
+  rescue Errno::ESRCH
+    false
+  end
+end
+
+MapLibrePreviewCLI.new.run

data/lib/maplibre-preview/version.rb

@@ -1,3 +1,3 @@
 module MapLibrePreview
-  VERSION = '1.1.3'
+  VERSION = '1.2.4'
 end

data/lib/maplibre-preview/views/maplibre_map.slim

@@ -85,6 +85,14 @@ javascript:
 
     const toDomId = (prefix, id) => `${prefix}-${String(id).replace(/[^a-zA-Z0-9_-]/g, '_')}`;
 
+    const getRealTerrainElevation = (lngLat) => {
+        const elevation = map.queryTerrainElevation(lngLat);
+        if (elevation == null) return null;
+        
+        const exaggeration = currentStyle?.terrain?.exaggeration || 1.0;
+        return elevation / exaggeration;
+    };
+
     const showLoading = () => document.getElementById('loading-indicator').style.display = 'block';
     const hideLoading = () => document.getElementById('loading-indicator').style.display = 'none';
 
@@ -322,11 +330,11 @@ javascript:
             features.length > 0 && console.log('Clicked feature:', features[0]);
 
             if (hoverMode === 'click' && currentStyle?.terrain) {
-                const elevation = map.queryTerrainElevation([e.lngLat.lng, e.lngLat.lat]);
-                if (elevation != null) {
+                const realElevation = getRealTerrainElevation([e.lngLat.lng, e.lngLat.lat]);
+                if (realElevation != null) {
                     elevationTooltip && elevationTooltip.style.display === 'block'
                         ? hideElevationTooltip()
-                        : showElevationTooltip(e.originalEvent, elevation);
+                        : showElevationTooltip(e.originalEvent, realElevation);
                 }
             }
         });
@@ -352,8 +360,10 @@ javascript:
             hideElevationTooltip();
 
             if (currentStyle?.terrain) {
-                const elevation = map.queryTerrainElevation([e.lngLat.lng, e.lngLat.lat]);
-                elevation != null && showElevationTooltip(e.originalEvent, elevation);
+                const realElevation = getRealTerrainElevation([e.lngLat.lng, e.lngLat.lat]);
+                if (realElevation != null) {
+                    showElevationTooltip(e.originalEvent, realElevation);
+                }
             }
 
             profileMode && profilePoints.length === 1 && updateTemporaryLine(e.lngLat);
@@ -419,7 +429,7 @@ javascript:
             document.body.appendChild(elevationTooltip);
         }
 
-        elevationTooltip.textContent = `${elevation.toFixed(1)} m`;
+        elevationTooltip.textContent = `${elevation.toFixed(1)}m`;
         elevationTooltip.style.left = `${e.clientX}px`;
         elevationTooltip.style.top = `${e.clientY}px`;
         elevationTooltip.style.display = 'block';
@@ -489,10 +499,10 @@ javascript:
             const t = i / numPoints;
             const lng = start.lng + (end.lng - start.lng) * t;
             const lat = start.lat + (end.lat - start.lat) * t;
-            const elevation = map.queryTerrainElevation([lng, lat]);
+            const realElevation = getRealTerrainElevation([lng, lat]);
             const distance = calculateDistance([start.lng, start.lat], [lng, lat]);
 
-            return {distance, elevation: elevation || 0, coordinates: [lng, lat]};
+            return {distance, elevation: realElevation, coordinates: [lng, lat]};
         });
     };
 

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: maplibre-preview
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Alexander Ludov
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2025-10-02 00:00:00.000000000 Z
+date: 2025-10-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +165,8 @@ description: A Ruby gem providing development tools for MapLibre GL JS styles, i
   monitoring.
 email:
 - efraam@gmail.com
-executables: []
+executables:
+- maplibre-preview
 extensions: []
 extra_rdoc_files: []
 files:
@@ -157,6 +178,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/maplibre-preview
 - docs/README_RU.md
 - lib/maplibre-preview.rb
 - lib/maplibre-preview/public/js/contour.js
@@ -181,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="