[elpa] externals/eev e4beb3a8e0: Added `find-osm' - i.e., support for OpenStreetMap.

[ELPA Syncer]

branch: externals/eev
commit e4beb3a8e075531a948004ea24ee9af109e5cdde
Author: Eduardo Ochs <eduardoochs@gmail.com>
Commit: Eduardo Ochs <eduardoochs@gmail.com>

    Added `find-osm' - i.e., support for OpenStreetMap.
---
 ChangeLog     | 16 ++++++++++------
 VERSION       | 24 ++----------------------
 eev-hlinks.el |  2 ++
 eev-intro.el  | 15 +++++++++++----
 eev-plinks.el | 19 +++++++++++++++++--
 eev-tlinks.el | 41 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd3a294fde..7c6048f1e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
+2022-03-16  Eduardo Ochs  <eduardoochs@gmail.com>
+
+       * eev-plinks.el (find-osm): new function.
+
+       * eev-hlinks.el (ee-fhl-main-program): added support for osm.
+       (ee-osm-bufferp): new function.
+
+       * eev-tlinks.el (find-osm-links, ee-find-osm-links, ee-osm-lat)
+       (ee-osm-lon, ee-osm-zoom): new functions.
+
 2022-03-13  Eduardo Ochs  <eduardoochs@gmail.com>
 
        * eev-template0.el (ee-template0-lex, ee-template00-lex)
@@ -11,7 +17,6 @@
 
        * eev-code.el (eev-version): new function.
 
->>>>>>> UTF-8
 2022-03-07  Eduardo Ochs  <eduardoochs@gmail.com>
 
        * eev-kla.el: rewritten almost completely.
@@ -22,7 +27,6 @@
        Generating short hyperlinks to info nodes" following some ideas
        by Bruno Macedo (thanks!=)).
 
->>>>>>> UTF-8
 2022-02-26  Eduardo Ochs  <eduardoochs@gmail.com>
 
        * eev-pdflike.el (ee-code-pdfbackend): make the functions of the
diff --git a/VERSION b/VERSION
index 70e7bf80bf..a87ee7146e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,22 +1,2 @@
-<<<<<<< ours
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-Mon Feb 28 06:20:20 GMT 2022
-Mon Feb 28 03:20:20 -03 2022
-=======
-Mon Mar  7 04:36:03 GMT 2022
-Mon Mar  7 01:36:03 -03 2022
->>>>>>> UTF-8
-=======
-Tue Mar  8 08:46:02 GMT 2022
-Tue Mar  8 05:46:02 -03 2022
->>>>>>> UTF-8
-=======
-Sun Mar 13 11:28:31 GMT 2022
-Sun Mar 13 08:28:31 -03 2022
->>>>>>> UTF-8
-=======
-Sun Mar 13 11:28:31 GMT 2022
-Sun Mar 13 08:28:31 -03 2022
->>>>>>> theirs
+Wed Mar 16 04:02:20 GMT 2022
+Wed Mar 16 01:02:20 -03 2022
diff --git a/eev-hlinks.el b/eev-hlinks.el
index 57c3458d04..fc92db510a 100644
--- a/eev-hlinks.el
+++ b/eev-hlinks.el
@@ -201,6 +201,7 @@ the \"*(find-here-links)*\" buffer."
    (:if (ee-wdired-bufferp)    (ee-find-file-links))
    (:if (ee-custom-bufferp)    (ee-find-custom-links))
    (:if (ee-epackages-bufferp) (ee-find-epackages-links))
+   (:if (ee-osm-bufferp)       (ee-find-osm-links))
    ;;
    ;; By buffer name:
    (:if (ee-intro-bufferp)     (ee-find-intro-links))
@@ -364,6 +365,7 @@ the \"*(find-here-links)*\" buffer."
 (defun ee-w3m-bufferp       () (eq major-mode 'w3m-mode))
 (defun ee-custom-bufferp    () (eq major-mode 'Custom-mode))
 (defun ee-epackages-bufferp () (eq major-mode 'package-menu-mode))
+(defun ee-osm-bufferp       () (eq major-mode 'osm-mode))
 
 ;; By buffer name
 (defun ee-intro-bufferp    () (ee-buffer-re "^\\*(find-\\(.*\\)-intro)\\*$"))
diff --git a/eev-intro.el b/eev-intro.el
index 604575a7ca..f115cb945d 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <eduardoochs@gmail.com>
 ;; Maintainer: Eduardo Ochs <eduardoochs@gmail.com>
-;; Version:    20220303
+;; Version:    20220313
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-intro.el>
@@ -2613,13 +2613,20 @@ Dependency on dynamic binding should be avoided - see:
   (find-elnode \"Dynamic Binding Tips\")
   (find-elnode \"Lexical Binding\")
 
-but the main function that eev uses for template strings is
+but the _default_ function that eev uses for template strings is
 intrinsically incompatible with lexical binding. See the comments
-in its source file,
+in its source file:
 
   (find-eev \"eev-template0.el\")
+  (find-eev \"eev-template0.el\" \"lexical-binding\")
 
-and this tutorial:
+It is possible to use a replacement for it that works in lexical
+binding, but I prefer to not make this replacement the default.
+See:
+
+  (find-eev \"eev-template0.el\" \"ee-template0-lex\")
+
+See also this tutorial:
 
   (find-lexical-intro)
 
diff --git a/eev-plinks.el b/eev-plinks.el
index 894e863caf..2e7bafa409 100644
--- a/eev-plinks.el
+++ b/eev-plinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <eduardoochs@gmail.com>
 ;; Maintainer: Eduardo Ochs <eduardoochs@gmail.com>
-;; Version:    20220214
+;; Version:    20220316
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-plinks.el>
@@ -115,6 +115,7 @@
 ;; «.find-wget»                (to "find-wget")
 ;; «.find-gitk»                (to "find-gitk")
 ;; «.find-tkdiff»      (to "find-tkdiff")
+;; «.find-osm»         (to "find-osm")
 ;; «.find-firefox»     (to "find-firefox")
 ;; «.find-googlechrome»        (to "find-googlechrome")
 
@@ -441,11 +442,25 @@ If wget can't download URL then this function runs 
`error'."
   "Run gitk in the directory DIR."
   (ee-at0 dir '(find-bgprocess "gitk --all --date-order")))
 
-
 ;; «find-tkdiff» (to ".find-tkdiff")
 (defun find-tkdiff (f1 f2)
   (find-bgprocess `("tkdiff" ,f1 ,f2)))
 
+;; «find-osm»  (to ".find-osm")
+;; Tests: (find-osm  43.7731  11.2562 17 "Il Duomo")
+;;        (find-osm -22.5014 -41.9259 15 "Near home")
+;; Needs: (find-epackage-links 'osm)
+;;
+(defun find-osm (lat lon zoom &rest comments)
+"Open a map. LAT, LON and ZOOM are the latitude, longitude, and zoom factor.
+The COMMENTS are ignored. You need to have osm.el - OpenStreetMap
+viewer - installed for this to work, and Emacs 28 or later."
+  (require 'osm)
+  (same-window-prefix)
+  (osm-goto lat lon zoom))
+
+
+
 
 ;; «find-firefox»       (to ".find-firefox")
 ;; «find-googlechrome»  (to ".find-googlechrome")
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 593c078b80..f37bc9d021 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -118,6 +118,7 @@
 ;; «.find-1stclassvideodef»            (to "find-1stclassvideodef")
 ;; «.find-1stclassvideos»              (to "find-1stclassvideos")
 ;; «.find-advicebefore-links»          (to "find-advicebefore-links")
+;; «.find-osm-links»                   (to "find-osm-links")
 
 
 (require 'eev-env)
@@ -2900,6 +2901,46 @@ how this works."
 
 
 
+;; «find-osm-links»  (to ".find-osm-links")
+;; Skel: (find-find-links-links-new "osm" "lat lon zoom" "")
+;; Test: (find-osm-links)
+;;  See: (find-efunction 'find-osm)
+;;
+(defun find-osm-links (&optional lat lon zoom &rest pos-spec-list)
+"Visit a temporary buffer containing hyperlinks for OpenStreetMap viewer."
+  (interactive)
+  (setq lat  (or lat  (ee-osm-lat)  "{lat}"))
+  (setq lon  (or lon  (ee-osm-lon)  "{lon}"))
+  (setq zoom (or zoom (ee-osm-zoom) "{zoom}"))
+  (apply
+   'find-elinks
+   `((find-osm-links ,lat ,lon ,zoom ,@pos-spec-list)
+     ;; Convention: the first sexp always regenerates the buffer.
+     (find-efunction 'find-osm-links)
+     ""
+     ,@(ee-find-osm-links lat lon zoom)
+     )
+   pos-spec-list))
+
+(defun ee-find-osm-links (&optional lat lon zoom)
+  "An internal function used by `find-osm-links'."
+  (setq lat  (or lat  (ee-osm-lat)  "{lat}"))
+  (setq lon  (or lon  (ee-osm-lon)  "{lon}"))
+  (setq zoom (or zoom (ee-osm-zoom) "{zoom}"))
+  ;;
+  `((find-osm ,lat ,lon ,zoom)
+    (osm-goto ,lat ,lon ,zoom)
+    (find-efunction 'find-osm)
+    (find-efunction 'osm-goto)))
+
+(defun ee-osm-lat  () (if (eq major-mode 'osm-mode) (osm--lat)))
+(defun ee-osm-lon  () (if (eq major-mode 'osm-mode) (osm--lon)))
+(defun ee-osm-zoom () (if (eq major-mode 'osm-mode)  osm--zoom))
+
+
+
+
+
 
 (provide 'eev-tlinks)